diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-04 22:28:15 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-04 22:28:15 +0000 |
commit | 3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f (patch) | |
tree | 3a2a3a3b984030b3f04665ea994437f9c09addf4 /prosody.cfg.lua.dist | |
parent | ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4 (diff) | |
parent | df618247d3fb899b69668dfcc084a154e04c34c6 (diff) | |
download | prosody-3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f.tar.gz prosody-3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions