Massimiliano 2d5f83c7b8 Merge branch 'master' into 'disapp-sr' ... # Conflicts: # app/src/main/res/values-sr/strings.xml		2018-12-23 21:02:33 +01:00
..
src	Merge branch 'master' into 'disapp-sr'	2018-12-23 21:02:33 +01:00
.gitignore	Started with Disroot app	2018-09-02 19:00:45 +02:00
build.gradle	Ready for v1.1.0	2018-12-21 09:19:06 +01:00
proguard-rules.pro	Started with Disroot app	2018-09-02 19:00:45 +02:00