Benoit Marty e541a3b962 Merge branch 'develop' into feature/bca/workaround_stuck_message		2021-03-16 15:00:55 +01:00
..
sampledata
signature
src	Merge branch 'develop' into feature/bca/workaround_stuck_message	2021-03-16 15:00:55 +01:00
.gitignore
build.gradle	Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0	2021-03-11 22:44:54 +01:00
lint.xml	Fix issue with Locale folder.	2021-03-10 21:54:11 +01:00
proguard-rules.pro