Christophe Vilayphiou c7d8e0b27b Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb		2012-04-24 16:32:00 +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	Fix ad_banner	2012-04-24 14:37:06 +08:00
stylesheets	Ray's changes in css	2012-04-24 16:24:50 +08:00