Changeset [ff98e30df2c244c3c7cedaba082d3355235d2a61] by Jesse Gumm
Revision ff98e30df2c244c3c7cedaba082d3355235d2a61,
committed by Jesse Gumm
· May 31st, 2012 @ 03:12 AM
Merge branch 'master' into mainline
Conflicts:
rel/copy_erl_interface.escript
https://github.com/nitrogen/nitrogen/commit/ff98e30df2c244c3c7cedab...
2 changed files
-
M
rel/overlay/mochiweb/etc/mochiweb.config -
M
rel/overlay/mochiweb/site/src/nitrogen_mochiweb.erl