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

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

2022-02-22 22:21:39 +01:00

..

googlePlayFlavor/release

ringmode bug fixed

2022-01-14 19:28:33 +01:00

src

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

2022-02-22 22:21:39 +01:00

.gitignore

…

build.gradle

libs

2022-02-06 15:02:07 +01:00

proguard-rules.pro

…