Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb		2012-04-12 07:13:13 +08:00
..
fonts	Ray's changes in announcenment back-end	2012-03-27 18:58:03 +08:00
images	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00
javascripts	Filter and delete for bulletins	2012-04-12 06:50:36 +08:00
stylesheets	Ray's fix for columns width in bulletins	2012-04-12 07:01:34 +08:00