ericdecanini 31a3552e26 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs ... # Conflicts: # vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt		2022-09-06 15:32:00 +02:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs	2022-09-06 15:32:00 +02:00
.gitignore
build.gradle	Merge pull request #6994 from vector-im/dependabot/gradle/com.github.UnifiedPush-android-embedded_fcm_distributor-2.1.3	2022-09-06 11:16:14 +02:00