z3r0c00l-2k 3295e4c1f5 Merge branch 'master' of https://github.com/z3r0c00l-2k/AquaDroid ... # Conflicts: # .idea/codeStyles/Project.xml		2020-01-20 09:54:20 +05:30
..
src/main	* Fixed typo in @string/workout_hint (English)	2019-11-24 15:01:56 +05:30
.gitignore	Git Init	2019-05-14 14:05:08 +05:30
build.gradle	targetSdkVersion 28 and 28 still causing build error.	2020-01-20 09:53:18 +05:30
proguard-rules.pro	Git Init	2019-05-14 14:05:08 +05:30