Merge branch 'notifier_unify' into notifier_performance

Conflicts:
	synapse/notifier.py

1 files changed, 1 insertions, 0 deletions

diff --git a/demo/start.sh b/demo/start.sh

index 5b3daef57f..b9cc14b9d2 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -31,6 +31,7 @@ for port in 8080 8081 8082; do
     #rm $DIR/etc/$port.config
     python -m synapse.app.homeserver \
         --generate-config \
+        --enable_registration \
         -H "localhost:$https_port" \
         --config-path "$DIR/etc/$port.config" \