Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| views | ||
Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| helpers | ||
| mailers | ||
| models | ||
| views | ||