Jens 56806f0349 Merge remote-tracking branch 'origin/master' into development ... # Conflicts: # app/googlePlayFlavor/release/output-metadata.json		2021-03-21 22:45:34 +01:00
..
googlePlayFlavor/release	Fixed app crashing when saving rules while service is running.	2021-03-21 22:44:40 +01:00
src	Merge remote-tracking branch 'origin/master' into development	2021-03-21 22:30:20 +01:00
.gitignore	Initial commit	2021-02-16 13:42:49 +01:00
build.gradle	Fixed app crashing when saving rules while service is running.	2021-03-21 22:27:34 +01:00
proguard-rules.pro	Initial commit	2021-02-16 13:42:49 +01:00