Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner ... Conflicts: app/views/admin/ad_banners/_ad_image_update.html.erb		2012-04-13 16:52:14 +08:00
..
_ad_banner_tab.html.erb	…
_ad_image_update.html.erb	Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner	2012-04-13 16:52:14 +08:00
_modal_ad_banner_form.html.erb	…
_new_add_banner_file.html.erb	…
_preview_block.html.erb	…
index.html.erb	…
new.html.erb	…