Orbit/vendor/built_in_modules
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
..
announcement Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-03-27 18:37:14 +08:00
new_blog Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
page_content fix announcement & links 2012-03-27 14:19:58 +08:00
web_resource fix announcement & links 2012-03-27 14:19:58 +08:00