Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

This commit is contained in:
Erik Johnston 2014-11-07 10:55:28 +00:00
commit 3cb678f84c
87 changed files with 2160 additions and 749 deletions

View file

@ -41,6 +41,6 @@ for port in 8080 8081 8082; do
done
echo "Starting webclient on port 8000..."
python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "webclient"
python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient"
cd "$CWD"