SpiritCroc e5c9c33a0f Merge tag 'v1.1.12' into sc ... Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236 Conflicts: library/ui-styles/src/main/res/values/text_appearances.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt vector/src/main/res/layout/dialog_export_e2e_keys.xml vector/src/main/res/layout/dialog_import_e2e_keys.xml		2021-07-05 16:58:45 +02:00
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature
src	Merge tag 'v1.1.12' into sc	2021-07-05 16:58:45 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.12' into sc	2021-07-05 16:58:45 +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