Merge branch 'order_in_settings_page' into 'master'

Fix the order of signin and signup on features page. See merge request !1720

Merge branch 'order_in_settings_page' into 'master'
c31628fc · Dmitriy Zaporozhets · dbd347bf · ce8359c1 · c31628fc
Commit c31628fc authored Mar 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_form.html.haml app/views/admin/application_settings/_form.html.haml +2 -2

No files found.
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -12,13 +12,13 @@
        .checkbox
          = f.label :signup_enabled do
            = f.check_box :signup_enabled
-            Signin enabled
+            Signup enabled
    .form-group
      .col-sm-offset-2.col-sm-10
        .checkbox
          = f.label :signin_enabled do
            = f.check_box :signin_enabled
-            Signup enabled
+            Signin enabled
    .form-group
      .col-sm-offset-2.col-sm-10
        .checkbox