Merge branch '5626-git-server-hostname' into 4752-docker-websockets
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 1 Apr 2015 20:14:19 +0000 (16:14 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 1 Apr 2015 20:14:19 +0000 (16:14 -0400)
commit379717415ec5f772ab2f54e263c2c3f44d77f70f
tree777e1e61e594b9784b16d3a31ac3d6d76c11b901
parentd318cc5c2459aa2fa9b25323b5b94eeeb6b63775
parent0b9904612ffa33ed488817659c00509661ac4865
Merge branch '5626-git-server-hostname' into 4752-docker-websockets
docker/api/Dockerfile