Daniele Gobbetti 3356a4b066 Merge remote-tracking branch 'origin/master' into low_battery_notification ... Conflicts: app/src/main/res/values/strings.xml		2015-08-26 15:46:33 +02:00
..
src	Merge remote-tracking branch 'origin/master' into low_battery_notification	2015-08-26 15:46:33 +02:00
build.gradle	bump version, update CHANGELOG.md	2015-08-22 22:36:32 +02:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00