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

..

java

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

2022-06-01 22:39:46 +02:00

res

wifi action

2022-06-01 22:36:30 +02:00

AndroidManifest.xml

broadcast trigger

2022-05-22 17:31:55 +02:00