Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||
Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||