-
Jan Lippert authored
Merge branch 'master' into develop Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/java/de/upb/fsmi/fsdroid/db/DatabaseHelper.java src/main/java/de/upb/fsmi/fsdroid/sync/FSDroidContentProvider.java
d5e070c6
Merge branch 'master' into develop Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/java/de/upb/fsmi/fsdroid/db/DatabaseHelper.java src/main/java/de/upb/fsmi/fsdroid/sync/FSDroidContentProvider.java