diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
commit | 0c4b66c051b2d199703713c634477fd1a2d62789 (patch) | |
tree | b003c23950a3bb53f56cc0eedaca77b2aaf4bbe0 /prosody.cfg.lua.dist | |
parent | ca21267fc0f59065aabc0a84bedcc535ec344cf1 (diff) | |
parent | 71b2b7782e075e596d29ee790879940ed946bfda (diff) | |
download | prosody-0c4b66c051b2d199703713c634477fd1a2d62789.tar.gz prosody-0c4b66c051b2d199703713c634477fd1a2d62789.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions