959def6c1f
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 |
||
---|---|---|
.. | ||
app | ||
config | ||
lib | ||
script | ||
test | ||
.gitignore | ||
Gemfile | ||
MIT-LICENSE | ||
README.rdoc | ||
Rakefile | ||
news.gemspec | ||
news.json |
README.rdoc
= News This project rocks and uses MIT-LICENSE.