Merge branch 'develop' into feature/burger-menu

d2b53235 · Yusuke Iwaki · GitHub · 7dfd882e · c020b195 · d2b53235
Commit d2b53235 authored Jan 10, 2017 by Yusuke Iwaki Committed by GitHub Jan 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

AndroidManifest.xml app/src/main/AndroidManifest.xml +1 -1

No files found.
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
                android:name=".activity.AddServerActivity"
                android:windowSoftInputMode="adjustResize" />
        <activity
-                android:name=".activity.ServerConfigActivity"
+                android:name=".activity.LoginActivity"
                android:windowSoftInputMode="adjustResize"
                android:configChanges="orientation|screenSize"/>