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 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config 
Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 		2012-11-26 17:55:53 +08:00
..
app Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config 2012-11-26 17:55:53 +08:00
config Fix: 2012-11-21 18:42:14 +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 first version of confined sidebar render 2012-11-20 15:56:52 +08:00

README.rdoc 

= Announcement

This project rocks and uses MIT-LICENSE.