Orbit/vendor/built_in_modules/announcement
Christophe Vilayphiou 959def6c1f Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt
Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb
2012-08-08 14:48:29 +08:00
..
app Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt 2012-08-08 14:48:29 +08:00
config 1.Remove category column when category is specified 2012-08-08 14:46:08 +08:00
lib Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-14 00:49:22 +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 LDAP with sync rake task 2012-03-06 16:41:06 +08:00

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.