Changeset [98df5e90b570552e79652e46ea7e61d258330aa5] by Jesse Gumm
Revision 98df5e90b570552e79652e46ea7e61d258330aa5,
committed by Jesse Gumm
· October 17th, 2012 @ 03:43 AM
Merge branch 'master' into mainline
https://github.com/nitrogen/nitrogen/commit/98df5e90b570552e79652e4...
16 changed files
-
A
TODO.markdown -
A
rel/overlay/common/site/src/mobile.erl -
A
rel/overlay/common/site/static/js/.empty -
A
rel/overlay/common/site/templates/mobile.html -
A
support/list_thanks/list_thanks.pl -
M
CHANGELOG.markdown -
M
Makefile -
M
THANKS.markdown -
M
rel/overlay/common/Makefile -
M
rel/overlay/common/etc/vm.args -
M
rel/overlay/common/site/src/index.erl -
M
rel/overlay/cowboy/etc/cowboy.config -
M
rel/overlay/cowboy/site/src/nitrogen_sup.erl -
M
rel/overlay/webmachine/etc/webmachine.config -
M
rel/overlay/webmachine/site/src/nitrogen_sup.erl -
M
rel/overlay/yaws/etc/yaws.conf