jens 5ae193847e Merge remote-tracking branch 'origin/development' into development ...

# Conflicts:
#	app/src/main/java/com/jens/automation2/Actions.java

2021-12-09 18:05:58 +01:00

..

jens/automation2

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

2021-12-09 18:05:58 +01:00