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
..
java	Merge remote-tracking branch 'origin/development' into development	2021-12-09 18:05:58 +01:00
res	Rework	2021-12-09 18:03:00 +01:00
AndroidManifest.xml	GooglePlayFlavor location engine disabled notice.	2021-03-16 23:23:42 +01:00