Viktor De Pasquale 2d55632430 Merge remote-tracking branch 'john/WIP' into development ... # Conflicts: # gradle/wrapper/gradle-wrapper.properties		2019-04-19 16:34:15 +02:00
..
src/main	Merge remote-tracking branch 'john/WIP' into development	2019-04-19 16:34:15 +02:00
.gitignore	Separate backend logic from frontend UI	2018-12-13 04:35:50 -05:00
build.gradle	Make debug buildable	2019-04-19 02:11:22 -04:00
proguard-rules.pro	Fix release builds	2019-04-19 03:26:33 -04:00