diff options
author | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
commit | fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba (patch) | |
tree | 04f1aa322632a0221c225ee6957b5863755a3b6d /prosody.cfg.lua.dist | |
parent | 4ce313959b678592a5fe0ef30b6813d058de45af (diff) | |
parent | 2c3ccf56744975a5f5acbc66d2e917e056467965 (diff) | |
download | prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.tar.gz prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.zip |
Merge with main branch.
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions