Christopher Beckmann a522f18d13 Merge remote-tracking branch 'origin/master' ... Conflicts: app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java app/src/main/res/drawable/ic_star_blue_48dp.png app/src/main/res/drawable/ic_star_grey_48dp.png app/src/main/res/drawable/ratingbar.xml		2016-02-20 21:01:21 +01:00
..
secuso/privacyfriendlysudoku	Merge remote-tracking branch 'origin/master'	2016-02-20 21:01:21 +01:00