jens 1388e55ae7 Merge branch 'master' of https://git.server47.de/jens/Automation ...

 Conflicts:

	app/src/main/java/com/jens/automation2/Miscellaneous.java

2021-02-20 02:05:13 +01:00

..

java

Merge branch 'master' of https://git.server47.de/jens/Automation

2021-02-20 02:05:13 +01:00

res

All 3 flavors can be compiled.

2021-02-17 22:27:53 +01:00

AndroidManifest.xml

All 3 flavors can be compiled.

2021-02-17 22:27:53 +01:00