diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:52:39 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:52:39 +0000 |
commit | 80c1a2634a90d0394188f8fa9a58caa112fcc30b (patch) | |
tree | 9392b528d10dfc77dde0fb76e4335b1b80e17491 /prosody.cfg.lua.dist | |
parent | 33ea9b5ab750619bac0431e71e5d636ce463fe0c (diff) | |
parent | adc2d4f169267b619ab6224ddf198f3437bac21a (diff) | |
download | prosody-80c1a2634a90d0394188f8fa9a58caa112fcc30b.tar.gz prosody-80c1a2634a90d0394188f8fa9a58caa112fcc30b.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions