Christophe Vilayphiou fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: Gemfile.lock app/controllers/admin/pages_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb		2012-02-27 18:56:15 +08:00
..
built_in_modules	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-02-27 18:56:15 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00