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
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Filter and delete for bulletins	2012-04-12 06:50:36 +08:00
helpers	merge with master	2012-01-11 20:31:52 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00
views	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-12 07:13:13 +08:00