Changeset [1679f9e6fd6e3ac28542bc4d6d481ce8d0e71f0f] by Jesse Gumm

June 10th, 2014 @ 09:31 PM

Merge branch 'master' into ws

Conflicts:
CHANGELOG.markdown Makefile rel/overlay/yaws/etc/yaws.conf https://github.com/nitrogen/nitrogen/commit/1679f9e6fd6e3ac28542bc4...

Committed by Jesse Gumm

  • A rel/overlay/slim/fix-slim-release
  • A rel/reltool_slim.config
  • M ".gitignore"
  • M ".travis.yml"
  • M CHANGELOG.markdown
  • M Makefile
  • M README.markdown
  • M THANKS.markdown
  • M TODO.markdown
  • M rebar.config
  • M rel/overlay/common/Makefile
  • M rel/overlay/common/bin/dev
  • M rel/overlay/rebar.config.src
  • M rel/reltool_base.config
New-ticket Create new ticket

Create your profile

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

Nitrogen Web Framework for Erlang