ericdecanini 64894d4443 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt		2022-08-24 20:25:02 +02:00
..
sampledata
signature
src	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation	2022-08-24 20:25:02 +02:00
.gitignore
build.gradle
lint.xml
proguard-rules.pro