Benoit Marty b9c28ba4ce Merge branch 'develop' into feature/bma/android12		2022-09-21 16:24:30 +02:00
..
androidTest/java/im/vector/app	Merge branch 'develop' into feature/bma/android12	2022-09-21 16:24:30 +02:00
debug	Move and enable deferred DMs into labs settings	2022-09-21 09:36:07 +02:00
fdroid	suppressing lint warning for constant that delegates to the correct value	2022-09-15 14:50:08 +01:00
gplay	lifting fdroid and gplay variants to the application module	2022-09-15 14:50:08 +01:00
main	Move xml resource in the module where they are used to avoid lint false positive UnusedResources issues.	2022-09-19 11:56:40 +02:00
nightly/res/xml	lifting nightly to the application module	2022-09-15 14:50:08 +01:00
release	lifting the release build type to the application module	2022-09-15 14:50:08 +01:00