Andreas Shimokawa 6c5b51cd6d Merge branch 'master' into feature-weather		2016-12-25 22:53:44 +01:00
..
src	Merge branch 'master' into feature-weather	2016-12-25 22:53:44 +01:00
build.gradle	update CHANGELOG, bump version	2016-12-24 23:04:01 +01:00
proguard-rules.pro	…