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

..

built_in_modules

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-04-24 16:32:00 +08:00

plugins

Merge with sub_roles

2011-12-23 18:34:21 +08:00