saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/vendor/built_in_modules/announcement
History
Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu 
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
 		2013-01-08 14:17:21 +08:00
..
app Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
config Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +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 branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00

README.rdoc 

= Announcement

This project rocks and uses MIT-LICENSE.