ericdecanini edb2d5d78e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/HomeActivity.kt # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt		2022-08-22 14:56:14 +02:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
signature	Setup nightly buildType	2022-07-05 16:07:12 +02:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation	2022-08-22 14:56:14 +02:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.53 to 8.12.54	2022-08-22 05:58:19 +00:00
lint.xml	Ignore PluralsCandidate, I do not know why it is reported by Danger, since this is a warning. Also make this issue an error.	2022-07-29 10:02:40 +02:00
proguard-rules.pro