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

..

googlePlayFlavor/release

permission for play sound

2021-10-31 13:27:45 +01:00

src

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

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

.gitignore

…

build.gradle

permission for play sound

2021-11-03 15:25:21 +01:00

proguard-rules.pro

…