orbit-basic/vendor/built_in_modules
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
..
announcement Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-02-27 18:56:15 +08:00
new_blog Ika's changes in modules 2012-02-20 08:48:27 +08:00
page_content Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
web_resource Fix bug due to image_filename -> image_identifier 2012-02-27 18:50:56 +08:00