Orbit/app/assets
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
..
fonts Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
images add pic and js for permission checkbox and filter 2012-04-12 07:14:06 +08:00
javascripts Comment out code that bugged upload image in ad_banner 2012-04-13 15:53:25 +08:00
stylesheets Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-13 16:52:14 +08:00