Changeset [9440e521e1dbc6bc45dfc06b136a69edbfc677bc] by Yehuda Katz

September 28th, 2008 @ 04:29 AM

Merge branch 'forking_bootloader' of git@github.com:wycats/merb-core into forking_bootloader

Fixed Conflicts:

lib/merb-core.rb
lib/merb-core/bootloader.rb
lib/merb-core/server.rb

http://github.com/wycats/merb-co...

Committed by Yehuda Katz

  • M lib/merb-core/server.rb

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »