Orbit/vendor/built_in_modules/announcement
Christophe Vilayphiou 039e837fff Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	app/views/admin/object_auths_new_interface/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
..
app Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 2012-05-14 00:51:53 +08:00
config Remove unless files and change routes. 2012-05-14 00:50:36 +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 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.