diff options
author | Kim Alvefur <zash@zash.se> | 2015-02-09 00:48:08 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-02-09 00:48:08 +0100 |
commit | 8dda0484865684469a2708ded7c1c1ab9542d766 (patch) | |
tree | 49e5401cc7a67229f027c050c934149317ef2146 /prosody.cfg.lua.dist | |
parent | a5b88cba341e0f99461b12d6dd42f54352c4b76a (diff) | |
parent | b7a38c8c93f8e6bee2579de6b9468fbb68c14589 (diff) | |
download | prosody-8dda0484865684469a2708ded7c1c1ab9542d766.tar.gz prosody-8dda0484865684469a2708ded7c1c1ab9542d766.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions