Changeset [e64060290891dc6aa4cc9ad3a0237cfb6e4b13ff] by Jesse Gumm
Revision e64060290891dc6aa4cc9ad3a0237cfb6e4b13ff,
committed by Jesse Gumm
· August 20th, 2014 @ 04:26 PM
Merge branch 'master' into ws
Conflicts:
rel/overlay/webmachine/site/src/static_resource.erl
https://github.com/nitrogen/nitrogen/commit/e64060290891dc6aa4cc9ad...
6 changed files
-
A
support/readlink/readlink-f.sh -
M
Makefile -
M
rebar -
M
rel/overlay/common/Makefile -
M
rel/overlay/slim/fix-slim-release -
M
rel/overlay/webmachine.deps