orbit-basic/vendor/built_in_modules/announcement
Christophe Vilayphiou c7d8e0b27b Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
..
app Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 16:32:00 +08:00
config Add missing translations in announcement and change announcement behavior for passed and rejected 2012-04-24 15:27:46 +08:00
lib First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +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 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.