Orbit/vendor
Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
..
built_in_modules Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-03-27 18:37:14 +08:00
plugins Merge with sub_roles 2011-12-23 18:34:21 +08:00