330f0cf5cc
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 |
||
|---|---|---|
| .. | ||
| androidTest | ||
| debug/res/drawable | ||
| main | ||
| release/res/drawable | ||
| sharedTest/java/im/vector/app/test/shared | ||
| test | ||