jens 98b49036a7 Merge remote-tracking branch 'origin/development-stable' into development ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml		2022-05-21 14:08:19 +02:00
..
com/jens/automation2	Merge remote-tracking branch 'origin/development-stable' into development	2022-05-21 14:08:19 +02:00
eu/chainfire/libsuperuser	Spanish translation	2021-05-19 21:06:15 +02:00