Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb |
||
|---|---|---|
| .. | ||
| admin | ||
| admin_helper.rb | ||
| application_helper.rb | ||
| attribute_fields_helper.rb | ||
| orbit_backend_helper.rb | ||
Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb |
||
|---|---|---|
| .. | ||
| admin | ||
| admin_helper.rb | ||
| application_helper.rb | ||
| attribute_fields_helper.rb | ||
| orbit_backend_helper.rb | ||