stom79 5723d9ea8d Merge branch 'filter_app' into stom79_baseline ... # Conflicts: # app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java		2018-04-14 15:32:15 +02:00
..
java/org/eu/exodus_privacy/exodusprivacy	Merge branch 'filter_app' into stom79_baseline	2018-04-14 15:32:15 +02:00
res	Merge branch 'filter_app' into stom79_baseline	2018-04-14 14:44:28 +02:00
AndroidManifest.xml	Merge branch 'landscape_mode' into stom79_baseline	2018-04-14 11:06:26 +02:00