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

..

androidTest/java/com/jens/automation2

Initial commit

2021-02-16 13:42:49 +01:00

apkFlavor

Merge remote-tracking branch 'origin/development-stable' into development

2022-05-15 01:54:32 +02:00

fdroidFlavor

fix in DateTimeTrigger management and executions when service already stopped

2022-04-04 20:21:34 +02:00

googlePlayFlavor

app picker removed from play store version

2022-05-21 14:06:09 +02:00

main

Merge remote-tracking branch 'origin/development-stable' into development

2022-05-21 14:08:19 +02:00

test/java/com/jens/automation2

Initial commit

2021-02-16 13:42:49 +01:00

google-services.json

Initial commit

2021-02-16 13:42:49 +01:00