diff options
author | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2012-11-12 10:48:40 -0800 |
commit | 347c1d73c855cfad8c37e8a0bd98a60831151812 (patch) | |
tree | 104c89712d9a1f7d7eefd49187a2f6bbc70a33ce /users/app/views/sessions/new.json.erb | |
parent | 67cb22d50193a58e4697549d9ce8a22e790a7a0d (diff) | |
parent | fe8b49232d31681667badaaeff7aa4d0a40445ea (diff) |
Merge branch 'develop' into help_develop
Conflicts:
help/test/functional/tickets_controller_test.rb
users/test/functional/application_controller_test.rb
users/test/support/auth_test_helper.rb
Diffstat (limited to 'users/app/views/sessions/new.json.erb')
-rw-r--r-- | users/app/views/sessions/new.json.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/users/app/views/sessions/new.json.erb b/users/app/views/sessions/new.json.erb new file mode 100644 index 0000000..36154b8 --- /dev/null +++ b/users/app/views/sessions/new.json.erb @@ -0,0 +1,3 @@ +{ +"errors": <%= raw @errors.to_json %> +} |