Onuray Sahin 2763ebdd5a Merge branch 'develop' into feature/ons/device_manager_filter ... # Conflicts: # vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt		2022-09-13 17:20:44 +03:00
..
androidTest/java/im/vector/app	Fix voice recording tests	2022-09-06 20:08:29 +02:00
debug	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs	2022-09-07 10:35:44 +02:00
fdroid	Use firebaseReceiver with FCM	2022-09-07 18:02:26 +02:00
gplay/java/im/vector/app	Firebase provides Map<String, String?>	2022-09-09 16:33:57 +02:00
main	Merge branch 'develop' into feature/ons/device_manager_filter	2022-09-13 17:20:44 +03:00
nightly/res/xml	Add sources for nightly. Use release version, change AnalyticsConfig.kt and shortcuts.xml.	2022-07-06 15:37:21 +02:00
release	Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary	2022-08-11 12:10:26 +02:00
sharedTest/java/im/vector/app/test/shared
test/java	Firebase provides Map<String, String?>	2022-09-09 16:33:57 +02:00