saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/vendor/built_in_modules/announcement
History
Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
 		2012-12-05 11:36:32 +08:00
..
app Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
config Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
lib Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +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 Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
init.rb Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00

README.rdoc 

= Announcement

This project rocks and uses MIT-LICENSE.