Conflicts: app/views/admin/pages/_form.html.erb |
||
|---|---|---|
| .. | ||
| _node.html.erb | ||
| _node_and_children.html.erb | ||
| _site_bar.html.erb | ||
| index.html.erb | ||
| reload_items.js | ||
Conflicts: app/views/admin/pages/_form.html.erb |
||
|---|---|---|
| .. | ||
| _node.html.erb | ||
| _node_and_children.html.erb | ||
| _site_bar.html.erb | ||
| index.html.erb | ||
| reload_items.js | ||