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
..
database	Test: fix other test	2017-04-17 19:36:50 +02:00
externalevents	Apps Notification can now be configured to filter notification content based on black- and whitelists	2018-12-03 09:48:16 +01:00
service	Implement factory reset feature in debug activity	2018-12-16 16:06:12 +01:00
test	Enhancement and Fixes for Bengali Transliteration. (#1263)	2018-10-01 23:04:51 +02:00