NIkita Fedrunov ce3fd43389 Merge branch 'develop' into feature/nfe/spaces_screens_tests
# Conflicts:
#	vector/src/androidTest/java/im/vector/app/EspressoExt.kt
#	vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
2022-02-16 13:42:39 +01:00
..
2021-12-03 11:39:41 +03:00
2022-02-04 12:20:20 +02:00