00e9a5df5b
Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb config/locales/en.yml config/routes.rb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
errors | ||
helpers | ||
jobs | ||
mailer | ||
models | ||
uploaders | ||
views |