diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-09 13:19:38 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-09 13:19:38 +0000 |
commit | 5ea1c295b302a15b2322fb0b103e0bab32d62643 (patch) | |
tree | 0370db4c0d6aab56f53997277141a014c9590d80 /prosody.cfg.lua.dist | |
parent | 72212273c0de9674bccc060a9d9c8ca4d286d72a (diff) | |
parent | b1279bc9a50d82e07ec96ed5b021071cd78c8521 (diff) | |
download | prosody-5ea1c295b302a15b2322fb0b103e0bab32d62643.tar.gz prosody-5ea1c295b302a15b2322fb0b103e0bab32d62643.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions