Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6 Conflicts: dependencies.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt 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/database/mapper/RoomSummaryMapper.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/sync/handler/room/RoomSyncHandler.kt vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt |
||
|---|---|---|
| .. | ||
| androidTest/java/im/vector/app | ||
| debug | ||
| fdroid | ||
| gplay | ||
| main | ||
| nightly/res/xml | ||
| release | ||