7c64e8c637
Conflicts: vendor/built_in_modules/ad_banner/config/locales/en.yml vendor/built_in_modules/ad_banner/init.rb |
||
|---|---|---|
| .. | ||
| _ad_banner_tab.html.erb | ||
| _ad_image_update.html.erb | ||
| _edit.html.erb | ||
| _index.html.erb | ||
| _modal_ad_banner_form.html.erb | ||
| _modal_preview.html.erb | ||
| _new.html.erb | ||
| _new_add_banner_file.html.erb | ||
| _preview_block.html.erb | ||
| create_error_msg.js.erb | ||
| edit.html.erb | ||
| edit.js.erb | ||
| index.html.erb | ||
| index.js.erb | ||
| new.html.erb | ||
| new.js.erb | ||
| new_created_node.js.erb | ||
| realtime_preview.js.erb | ||