orbit-basic/vendor/built_in_modules/announcement
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
..
app Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev 2012-02-20 16:25:29 +08:00
config remove bulletins_list 2012-02-20 16:23:54 +08:00
lib merge with master 2012-01-11 20:31:52 +08:00
script merge with master 2012-01-11 20:31:52 +08:00
test merge with master 2012-01-11 20:31:52 +08:00
.gitignore merge with master 2012-01-11 20:31:52 +08:00
Gemfile merge with master 2012-01-11 20:31:52 +08:00
MIT-LICENSE merge with master 2012-01-11 20:31:52 +08:00
README.rdoc merge with master 2012-01-11 20:31:52 +08:00
Rakefile merge with master 2012-01-11 20:31:52 +08:00
announcement.gemspec merge with master 2012-01-11 20:31:52 +08:00
announcement.json remove bulletins_list 2012-02-20 16:23:54 +08:00

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.