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

..

src

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

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

.gitignore

Initial commit

2021-02-16 13:42:49 +01:00

build.gradle

All 3 flavors can be compiled.

2021-02-16 23:38:38 +01:00

proguard-rules.pro

Initial commit

2021-02-16 13:42:49 +01:00