diff options
| author | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
| commit | 41303b0a2a07b897f7373eebba25708da89085a1 (patch) | |
| tree | 88e48da31bdd92d80af76c18d0df992f7d09f91b /app/views/users | |
| parent | a1aafe9eec98f91fd76d104964ad98fcafc94a80 (diff) | |
| parent | a9bf3a7e1fd802025824668e477a5ec14ce81d5a (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml index 9a75677..90d0e02 100644 --- a/app/views/users/_form.html.haml +++ b/app/views/users/_form.html.haml @@ -4,7 +4,7 @@ = render "form_core", :f => f - .actions + .form-actions = f.button :submit, conditional_t('users.form.submit') - else = simple_form_for(@user) do |f| @@ -12,5 +12,5 @@ = render "form_core", :f => f - .actions + .form-actions = f.button :submit, conditional_t('users.form.submit') |