Auxilor 55d9b16986 Merge remote-tracking branch 'origin/master' ... # Conflicts: # gradle.properties		2021-10-30 10:52:31 +01:00
..
src/main	Merge remote-tracking branch 'origin/master'	2021-10-30 10:52:31 +01:00
build.gradle	Added persistent data storage and kotlin	2021-10-18 17:32:03 +01:00