Oliver Jan Krylow a4e9936a85 Merge branch 'master' of https://github.com/LonamiWebs/Klooni1010 ... # Conflicts: # gradle/wrapper/gradle-wrapper.properties Also added Solarized Dark theme.		2017-05-08 19:15:18 +02:00
..
src	Merge branch 'master' of https://github.com/LonamiWebs/Klooni1010	2017-05-08 19:15:18 +02:00
build.gradle	Add main menu screen	2017-01-22 15:34:45 +01:00