Massimiliano 3cbb7bb4f0 Merge branch 'master' into 'disapp-sr' ... # Conflicts: # app/src/main/res/values-sr/strings.xml		2019-05-29 21:47:08 +02:00
..
src	Merge branch 'master' into 'disapp-sr'	2019-05-29 21:47:08 +02:00
.gitignore	Started with Disroot app	2018-09-02 19:00:45 +02:00
build.gradle	Corrected errors in strings and changed to version 1.2.0	2019-05-26 12:12:05 +02:00
proguard-rules.pro	Started with Disroot app	2018-09-02 19:00:45 +02:00