NIkita Fedrunov 035ef6b284 Merge branch 'develop' into feature/nfe/app_layout_tests ... # Conflicts: # vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt		2022-10-18 10:46:32 +02:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge branch 'develop' into feature/nfe/app_layout_tests	2022-10-18 10:46:32 +02:00
.gitignore
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00