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
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Add missing translations in announcement and change announcement behavior for passed and rejected	2012-04-24 15:27:46 +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 filter and sort for status in announcement	2012-04-24 00:46:34 +08:00
views	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 16:32:00 +08:00