ericdecanini 60adecedd6 Merge branch 'feature/eric/improve-back-navigation' into experiment/eric/space-switching-modal ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
#	vector/src/main/res/layout/fragment_home_detail.xml

2022-05-17 15:48:01 +02:00

..

docs

Add a note when generated from this project.

2022-05-11 11:14:45 +02:00

src

Merge branch 'feature/eric/improve-back-navigation' into experiment/eric/space-switching-modal

2022-05-17 15:48:01 +02:00

.gitignore

…

build.gradle

Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21

2022-05-10 18:23:51 +02:00

proguard-rules.pro

…