Andreas Shimokawa b045d5ac26 Merge branch 'master' into feature-weather		2016-12-30 00:10:54 +01:00
..
src	Merge branch 'master' into feature-weather	2016-12-30 00:10:54 +01:00
build.gradle	bump version, update CHANGELOG, not yet ready for release	2016-12-25 23:19:37 +01:00
proguard-rules.pro	…