Benoit Marty 454baf8beb Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data		2021-12-31 13:02:24 +01:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data	2021-12-31 13:02:24 +01:00
.gitignore
build.gradle	Merge pull request #4809 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.40	2021-12-30 10:30:27 +01:00
lint.xml	Fix "@JvmStatic used for @Provides function in an object class" Lint warning.	2021-11-19 15:29:11 +01:00
proguard-rules.pro