
Conflicts: res/layout/appdetails.xml res/values/strings.xml src/org/fdroid/fdroid/DB.java src/org/fdroid/fdroid/FDroid.java src/org/fdroid/fdroid/ManageRepo.java
Conflicts: res/layout/appdetails.xml res/values/strings.xml src/org/fdroid/fdroid/DB.java src/org/fdroid/fdroid/FDroid.java src/org/fdroid/fdroid/ManageRepo.java