Gongxter b25b55afb7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java # app/src/main/res/values/strings.xml		2016-01-21 16:55:24 +01:00
..
main	Merge remote-tracking branch 'origin/master'	2016-01-21 16:55:24 +01:00
test/java/org/secuso/privacyfriendlysudoku	Fixed Issue#6 and fixed an activity stack bug, that caused the app to have multiple main menus in the stack.	2016-01-21 14:26:59 +01:00