diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-03 17:24:20 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-03 17:24:20 +0000 |
| commit | 96a4cbc2a717b062cc3ee488094345910ca6e6ea (patch) | |
| tree | 5291a5e0be4b5d313576df3e1f0b42d18ced3271 /prosody.cfg.lua.dist | |
| parent | 7ec231373fcb0fb4448053ad4ea0c8d656b2cc4e (diff) | |
| parent | 00fd43edfd16b99092be5ad927abfb4d77316000 (diff) | |
| download | prosody-96a4cbc2a717b062cc3ee488094345910ca6e6ea.tar.gz prosody-96a4cbc2a717b062cc3ee488094345910ca6e6ea.zip | |
Automated merge with http://waqas.ath.cx/
Diffstat (limited to 'prosody.cfg.lua.dist')
| -rw-r--r-- | prosody.cfg.lua.dist | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 5a0fab71..7289921a 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -75,4 +75,3 @@ Host "example.com" }
enabled = false -- This will disable the host, preserving the config, but denying connections
->>>>>>> other
|