Christophe Vilayphiou 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb		2012-04-25 16:39:26 +08:00
..
fonts	Ray's changes in announcenment back-end	2012-03-27 18:58:03 +08:00
images	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
javascripts	Change ad_banner preview from using title to id	2012-04-25 16:10:11 +08:00
stylesheets	Ray's css fix for quick edit	2012-04-25 16:26:27 +08:00