abettenburg 51399066a4 Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications ... # Conflicts: # app/src/main/res/values/strings.xml		2019-01-12 09:55:53 +01:00
..
daogen	Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications	2019-01-12 09:55:53 +01:00