aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-04 01:41:09 +0200
committerKim Alvefur <zash@zash.se>2017-04-04 01:41:09 +0200
commit5354e5645ec328120cadd24a7dfa7139fd07ec60 (patch)
tree0c04cc8be235f6105a1fd70380b87f3d7bb8b8b4 /prosody.cfg.lua.dist
parent8962d239ed6f606d2808c4fddae80553bc391107 (diff)
parentf94c56040c088f63efdcab886d8ffc311d2e4359 (diff)
downloadprosody-5354e5645ec328120cadd24a7dfa7139fd07ec60.tar.gz
prosody-5354e5645ec328120cadd24a7dfa7139fd07ec60.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions