Conflicts: app/views/admin/pages/_form.html.erb |
||
---|---|---|
.. | ||
_edit.html.erb | ||
_form.html.erb | ||
_new.html.erb | ||
edit.html.erb | ||
edit.js.erb | ||
new.html.erb | ||
new.js.erb |
Conflicts: app/views/admin/pages/_form.html.erb |
||
---|---|---|
.. | ||
_edit.html.erb | ||
_form.html.erb | ||
_new.html.erb | ||
edit.html.erb | ||
edit.js.erb | ||
new.html.erb | ||
new.js.erb |