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
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5424.bugfix	Fix add by QR code layout (#5424)	2022-09-10 10:53:34 -07:00
7035.misc	Changelog	2022-09-06 11:45:05 +02:00
7043.wip	towncrier	2022-09-10 08:04:20 +02:00
7045.wip	Add changelog.	2022-09-06 18:49:15 +03:00