Benoit Marty 8b15008eba Merge branch 'develop' into feature/bma/displayname_fallback		2021-04-06 14:31:32 +02:00
..
sampledata
signature
src	Merge branch 'develop' into feature/bma/displayname_fallback	2021-04-06 14:31:32 +02:00
.gitignore
build.gradle	Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0	2021-04-06 14:22:12 +02:00
lint.xml	Fix issue with Locale folder.	2021-03-10 21:54:11 +01:00
proguard-rules.pro