Conflicts: app/views/admin/ad_banners/index.html.erb app/views/admin/ad_images/_form.html.erb vendor/built_in_modules/ad_banner/init.rb |
||
|---|---|---|
| .. | ||
| Archive | ||
| fonts | ||
| images | ||
| javascripts | ||
| stylesheets | ||
Conflicts: app/views/admin/ad_banners/index.html.erb app/views/admin/ad_images/_form.html.erb vendor/built_in_modules/ad_banner/init.rb |
||
|---|---|---|
| .. | ||
| Archive | ||
| fonts | ||
| images | ||
| javascripts | ||
| stylesheets | ||