diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:27:55 -0500 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:27:55 -0500 |
commit | f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b (patch) | |
tree | 961993cab2a02c20c789b381d93a74a8d74164fe /prosody.cfg.lua.dist | |
parent | 667f75150d48db1815d8566228a41e9290fe163e (diff) | |
parent | 6a177d7ad6517cd53943c4e03d2bac578d251108 (diff) | |
download | prosody-f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b.tar.gz prosody-f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions