forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/sites_controller.rb |
||
|---|---|---|
| .. | ||
| _user.html.erb | ||
| index.html.erb | ||
| modal_select.js.erb | ||
| reload_users.js.erb | ||
| remove_users.js.erb | ||
| unauthorized.html.erb | ||
Conflicts: app/controllers/admin/sites_controller.rb |
||
|---|---|---|
| .. | ||
| _user.html.erb | ||
| index.html.erb | ||
| modal_select.js.erb | ||
| reload_users.js.erb | ||
| remove_users.js.erb | ||
| unauthorized.html.erb | ||