ericdecanini 95b37e2838 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation ... # Conflicts: # vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt		2022-08-26 14:06:11 +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-26 14:06:11 +02:00
.gitignore
build.gradle	Version++	2022-08-23 17:02:24 +02: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