4f60963741
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9 Conflicts: 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/session/room/timeline/DefaultTimeline.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt vector/src/main/res/drawable/ic_settings_root_flair.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/xml/vector_settings_labs.xml |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle | ||