Merge branch 'master' into fdroid

# Conflicts: # .magnum.yml # .travis.yml # README.md # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/commit451/gitlab/LabCoatApp.java # build.gradle

Merge branch 'master' into fdroid
c265a2ab · Michi302 · 1b90c181 · 16caa78a · 1b90c181 · c265a2ab
Commit c265a2ab authored 8 years ago by Michi302
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
--- a/app/src/test/java/com/commit451/gitlab/ApiTests.java
+++ b/app/src/test/java/com/commit451/gitlab/ApiTests.java
--- a/app/src/test/java/com/commit451/gitlab/CountingRouter.java
+++ b/app/src/test/java/com/commit451/gitlab/CountingRouter.java
--- a/app/src/test/java/com/commit451/gitlab/RoutingTests.java
+++ b/app/src/test/java/com/commit451/gitlab/RoutingTests.java
--- a/app/src/test/java/com/commit451/gitlab/TestUtil.java
+++ b/app/src/test/java/com/commit451/gitlab/TestUtil.java
--- a/art/google-play-badge.png
+++ b/art/google-play-badge.png
--- a/art/ic_launcher-web.png
+++ b/art/ic_launcher-web.png
--- a/art/screenshot-1.png
+++ b/art/screenshot-1.png
--- a/build.gradle
+++ b/build.gradle