stom79 7d814d8ce3 Merge branch 'conscrypt_disable' into develop		2019-02-14 11:32:01 +01:00
..
src	Merge branch 'conscrypt_disable' into develop	2019-02-14 11:32:01 +01:00
.gitignore	…
build.gradle	Disable conscrypt in login page	2019-02-14 10:06:18 +01:00
proguard-rules.pro	…