Merge branch 'master' into fdroid

1b90c181 · Michi302 · cc5fea52 · 1dd2e31b · 1b90c181 · 1b90c181
Commit 1b90c181 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/LoginUnitTest.java
+++ b/app/src/test/java/com/commit451/gitlab/LoginUnitTest.java
--- a/build.gradle
+++ b/build.gradle
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
--- a/gradlew
+++ b/gradlew
--- a/gradlew.bat
+++ b/gradlew.bat