SpiritCroc c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc ...

Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml

2020-08-22 09:52:54 +02:00

..

sampledata

…

signature

…

src

Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc

2020-08-22 09:52:54 +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

Try to remove rule that is breaking CI

2020-03-11 11:19:22 +01:00

proguard-rules.pro

Add proguard command (commented)

2020-07-02 22:02:42 +02:00