Merge branch 'master' into fdroid

# Conflicts: # .gitlab-ci.yml # .magnum.yml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/commit451/gitlab/GitLabApp.java

Merge branch 'master' into fdroid
38c2d95b · Michi302 · 0216e5f3 · d79d79f5 · 38c2d95b · 38c2d95b
Commit 38c2d95b authored 9 years ago by Michi302
--- a/app/src/main/res/layout/item_project.xml
+++ b/app/src/main/res/layout/item_project.xml
--- a/app/src/main/res/layout/item_spinner_milestone.xml
+++ b/app/src/main/res/layout/item_spinner_milestone.xml
--- a/app/src/main/res/layout/progress_fullscreen.xml
+++ b/app/src/main/res/layout/progress_fullscreen.xml
--- a/app/src/main/res/menu/item_menu_account.xml
+++ b/app/src/main/res/menu/item_menu_account.xml
--- a/app/src/main/res/menu/menu_file.xml
+++ b/app/src/main/res/menu/menu_file.xml
--- a/app/src/main/res/menu/diff.xml
+++ b/app/src/main/res/menu/diff.xml
--- a/app/src/main/res/menu/menu_add_milestone.xml
+++ b/app/src/main/res/menu/menu_add_milestone.xml
--- a/app/src/main/res/menu/menu_edit_milestone.xml
+++ b/app/src/main/res/menu/menu_edit_milestone.xml
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
--- a/ic_launcher-web.png
+++ b/ic_launcher-web.png
--- a/art/screenshot-1.png
+++ b/art/screenshot-1.png
--- a/build.gradle
+++ b/build.gradle
--- a/prepare-build.sh
+++ b/prepare-build.sh