Orbit/vendor/built_in_modules/announcement/app
unknown b0834c0c62 Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev
Conflicts:
	app/views/layouts/module_widget.html.erb
2012-02-20 16:25:29 +08:00
..
assets Changes for jquery 1.7 (.live -> .on), create module_layout 2012-02-20 03:24:05 +08:00
controllers Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev 2012-02-20 16:25:29 +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 remove bulletins_list 2012-02-20 16:23:54 +08:00
views remove bulletins_list 2012-02-20 16:23:54 +08:00