SpiritCroc 330f0cf5cc Merge tag 'v1.5.12' into sc ... Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt vector-app/build.gradle vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt vector-config/src/main/res/values/config-settings.xml vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt		2022-12-15 11:01:52 +01:00
..
src/main	Merge tag 'v1.5.12' into sc	2022-12-15 11:01:52 +01:00
.gitignore	Create module vector-config	2022-02-23 18:08:04 +01:00
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00