Jens 5af59e1754 Merge remote-tracking branch 'origin/development-stable' into development
# Conflicts:
#	app/src/main/java/com/jens/automation2/Trigger.java
2022-02-22 22:21:39 +01:00
..
2021-02-16 13:42:49 +01:00
2022-02-06 15:02:07 +01:00
2021-02-16 13:42:49 +01:00