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

..

attachment-viewer

Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment

2022-06-03 12:06:23 +02:00

core-utils

Merge branch 'develop' into dependency-cleanup

2022-05-19 12:27:09 +02:00

diff-match-patch

Global import optimization

2022-04-12 16:06:27 +02:00

jsonviewer

removing no longer needed butterknife dependency

2022-06-29 17:22:57 +01:00

multipicker

Gallery picker can pick external images

2022-07-04 16:42:43 +12:00

ui-strings

Merge branch 'develop' into feature/ons/device_manager_filter

2022-09-13 17:20:44 +03:00

ui-styles

Update device list according to the filter type.

2022-09-08 18:28:17 +03:00