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
..
androidTest	Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message	2022-12-14 17:39:42 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
main	Merge tag 'v1.5.12' into sc	2022-12-15 11:01:52 +01:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Merge pull request #7757 from vector-im/fix/mna/poll-end-not-recognized	2022-12-13 17:08:01 +01:00