Stefan Schüller 341b62fa57 Merge remote-tracking branch 'GitHub/master' into develop ...

# Conflicts:
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_general.xml

2020-06-19 08:37:15 +02:00

..

pref_general.xml

Merge remote-tracking branch 'GitHub/master' into develop

2020-06-19 08:37:15 +02:00

searchable.xml

- Implemented basic search

2018-11-10 22:40:27 +01:00