jens 88a3ab8241 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/src/main/java/com/jens/automation2/ActivityManageRule.java
2022-06-01 22:39:46 +02:00
..
2022-05-15 01:37:18 +02:00
2021-02-16 13:42:49 +01:00
2022-05-29 13:38:57 +02:00
2021-02-16 13:42:49 +01:00