SpiritCroc acb12c2005 Merge tag 'v1.1.14' into sc ... Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt		2021-07-24 10:12:48 +02:00
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature	Share the debug signature to all machines which build the debug APK	2019-06-07 10:17:14 +02:00
src	Merge tag 'v1.1.14' into sc	2021-07-24 10:12:48 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.14' into sc	2021-07-24 10:12:48 +02:00
lint.xml	Remove useless parent	2021-06-11 10:22:18 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00