SpiritCroc 28f65ec0e8 Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc ... Merge v1.0.5 pt. 5 Conflicts: README.md vector/src/main/java/im/vector/app/features/login/LoginFragment.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt		2020-08-22 10:54:14 +02:00
..
sampledata
signature
src	Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc	2020-08-22 10:54:14 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc	2020-08-22 09:52:54 +02:00
lint.xml	Fix lint issue UnusedQuantity and ensure it will be an error in the future	2020-08-13 12:15:15 +02:00
proguard-rules.pro	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00