Onuray Sahin 61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter ...

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml

2022-09-16 15:25:09 +03:00

..

src

Merge branch 'develop' into feature/ons/device_manager_filter

2022-09-16 15:25:09 +03:00

.gitignore

Create module for ui-styles

2021-06-15 12:23:54 +02:00

build.gradle

Migration to activity 1.5.0. Rework menu management

2022-07-01 17:06:02 +02:00