aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-09 17:03:15 +0200
committerKim Alvefur <zash@zash.se>2013-06-09 17:03:15 +0200
commit0086d5819d632016a5795c9718be2f35c22ac8f5 (patch)
treed2df3e2e2d6e79961b1a312a8049eed3f6c55da5 /prosody.cfg.lua.dist
parenta07cafce699eefa1c588171d29ce9ad8944d30a1 (diff)
parent4675a091eb6a3f877c47b95f03026b8688c66d05 (diff)
downloadprosody-0086d5819d632016a5795c9718be2f35c22ac8f5.tar.gz
prosody-0086d5819d632016a5795c9718be2f35c22ac8f5.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions