diff options
| author | Raphael <raphael@joindiaspora.com> | 2010-10-20 20:52:23 +0400 |
|---|---|---|
| committer | Raphael <raphael@joindiaspora.com> | 2010-10-20 20:52:23 +0400 |
| commit | 1bd54aba63bdc1a93f351eab139ce34ab44a4d8f (patch) | |
| tree | 011283783089ef8c3eaf77a205cd17a1dc88de8f /config/app_config.yml.example | |
| parent | 951c513f392cd440fc80306bec69dfcc0b10c13c (diff) | |
Revert "Merge remote branch 'upstream/master'"
This reverts commit 570d0cf104719813cdd167788db9ea8fa1cf2211, reversing
changes made to 9da53994258ac85250de799ae9a2bb96470b0c73.
Diffstat (limited to 'config/app_config.yml.example')
| -rw-r--r-- | config/app_config.yml.example | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/app_config.yml.example b/config/app_config.yml.example index 90d9ac9f4..0bd3771f7 100644 --- a/config/app_config.yml.example +++ b/config/app_config.yml.example @@ -7,7 +7,6 @@ default: debug: false socket_debug : false socket_host: 0.0.0.0 - socket_pidfile: log/diaspora-wsd.pid socket_port: 8080 socket_collection_name: 'websocket' pubsub_server: 'https://pubsubhubbub.appspot.com/' |