25dddf7566
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt |
||
---|---|---|
.. | ||
attachment-viewer | ||
core-utils | ||
external | ||
multipicker | ||
ui-strings | ||
ui-styles |