Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| jquery.cycle2.flip.min.js | ||
| jquery.cycle2.ie-fade.min.js | ||
| jquery.cycle2.scrollVert.min.js | ||
| jquery.cycle2.tile.min.js | ||
Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| jquery.cycle2.flip.min.js | ||
| jquery.cycle2.ie-fade.min.js | ||
| jquery.cycle2.scrollVert.min.js | ||
| jquery.cycle2.tile.min.js | ||