SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc ... Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6 Conflicts: vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt		2021-02-04 17:10:15 +01:00
..
androidTest/java/im/vector/app	fix test compilation	2021-02-03 15:38:16 +01:00
debug	Split long lines and cleanup	2020-12-16 14:33:44 +01:00
fdroid	Rename parameters for clarity	2021-01-12 16:07:49 +01:00
gplay	Merge tag 'v1.0.12' into sc	2020-12-15 15:55:14 +01:00
main	Merge tag 'v1.0.16' into sc	2021-02-04 17:10:15 +01:00
release	Using ApplicationId from BuildConfig	2020-10-13 20:17:56 +02:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app