SpiritCroc
|
bb6595110b
|
Merge tag 'v1.5.0' into merge-v1.5.0
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/menu/menu_new_home.xml
vector/src/main/res/xml/vector_settings_labs.xml
|
2022-09-23 16:28:00 +02:00 |
|
Florian Renaud
|
e9d809d9c3
|
Move and enable deferred DMs into labs settings
|
2022-09-21 09:36:07 +02:00 |
|
Adam Brown
|
1d50bbdbda
|
fixing manifest imports and giving androidTest its own dedicated manifest
|
2022-09-15 14:50:08 +01:00 |
|
Adam Brown
|
373a0ca4fb
|
split commit to make debug changes to avoid files being seen as new!
|
2022-09-15 14:50:08 +01:00 |
|
Adam Brown
|
5d533d4ec9
|
lifting debug build type to the application module
|
2022-09-15 14:50:08 +01:00 |
|