Merged branch develop into master

af79125c · John Carlson · 5212b54f · 747021e0 · 5212b54f · af79125c
Commit af79125c authored 8 years ago by John Carlson
--- a/app/src/main/java/com/commit451/gitlab/activity/TodosActivity.java
+++ b/app/src/main/java/com/commit451/gitlab/activity/TodosActivity.java
--- a/app/src/main/java/com/commit451/gitlab/activity/TodosActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/TodosActivity.kt
--- a/app/src/main/java/com/commit451/gitlab/activity/UserActivity.java
+++ b/app/src/main/java/com/commit451/gitlab/activity/UserActivity.java
--- a/app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt
--- a/app/src/main/java/com/commit451/gitlab/activity/WebLoginActivity.java
+++ b/app/src/main/java/com/commit451/gitlab/activity/WebLoginActivity.java
--- a/app/src/main/java/com/commit451/gitlab/activity/WebLoginActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/WebLoginActivity.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/AccountAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AccountAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/AccountAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AccountAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/AddIssueLabelAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AddIssueLabelAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/AddIssueLabelAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AddIssueLabelAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/AssigneeSpinnerAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AssigneeSpinnerAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/AssigneeSpinnerAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/AssigneeSpinnerAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/BranchAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BranchAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/BranchAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BranchAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/BreadcrumbAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BreadcrumbAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BreadcrumbAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/BuildAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BuildAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/BuildAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BuildAdapter.kt
--- a/app/src/main/java/com/commit451/gitlab/adapter/BuildSectionsPagerAdapter.java
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BuildSectionsPagerAdapter.java
--- a/app/src/main/java/com/commit451/gitlab/adapter/BuildSectionsPagerAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/BuildSectionsPagerAdapter.kt