Merged branch develop into master

af79125c · John Carlson · 5212b54f · 747021e0 · 5212b54f · af79125c
Commit af79125c authored 8 years ago by John Carlson
--- a/app/src/test/java/com/commit451/gitlab/TestUtil.java
+++ b/app/src/test/java/com/commit451/gitlab/TestUtil.java
--- a/app/src/test/java/com/commit451/gitlab/TestUtil.kt
+++ b/app/src/test/java/com/commit451/gitlab/TestUtil.kt
--- a/build.gradle
+++ b/build.gradle