Orbit/vendor/built_in_modules/announcement/app
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
..
assets Ika's changes 2012-02-23 15:53:15 +08:00
controllers fix announcement & links 2012-03-27 14:19:58 +08:00
helpers merge with master 2012-01-11 20:31:52 +08:00
mailers merge with master 2012-01-11 20:31:52 +08:00
models Delete files with Chinese characters in name 2012-03-27 14:21:32 +08:00
views Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-03-27 18:37:14 +08:00