Orbit/vendor/built_in_modules/announcement
Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
..
app Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine 2012-02-29 13:07:21 +08:00
config i18n vars for announcement 2012-02-29 11:54:48 +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.