Merge branch 'master' of github.com:diaspora/diaspora into production

This commit is contained in:
maxwell 2010-08-24 14:46:02 -07:00
commit 00be2a6c40

View file

@ -1,6 +1,6 @@
development:
debug: false
socket_debug : true
socket_debug : false
socket_port: 8080
pubsub_server: 'https://pubsubhubbub.appspot.com/'