aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-28 12:51:12 +0200
committerKim Alvefur <zash@zash.se>2016-05-28 12:51:12 +0200
commite8e531fa1d45b4b454abdac3a170cba16da02b86 (patch)
treeaf9b1ce44f8066574de3d39858357fa64c4aa35b /prosody.cfg.lua.dist
parenta94034cbe38778a9e9bdf6bc10faf8a1584f4156 (diff)
parentb44930be7ec51bc82cdc977f9d4320bb747ffc40 (diff)
downloadprosody-e8e531fa1d45b4b454abdac3a170cba16da02b86.tar.gz
prosody-e8e531fa1d45b4b454abdac3a170cba16da02b86.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions