diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
commit | 65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e (patch) | |
tree | 1e63192849a869212df2448f814cb37c91b04fe5 /prosody.cfg.lua.dist | |
parent | 77918edaac029ab1fe1c62ffe5a72e0ed0046065 (diff) | |
parent | b58d3248b78bce1bc07575ab1ff2a6f30324fc28 (diff) | |
download | prosody-65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e.tar.gz prosody-65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions