Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb		2012-03-16 14:55:21 +08:00
..
built_in_modules	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-03-16 14:55:21 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00