aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-12 00:32:10 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-12 00:32:10 +0100
commitf823a63ce870f3b464e06d15a41e5ecbbc88b583 (patch)
tree8d6271d7aa6669750651b16347b61448eda8e0b6 /prosody.cfg.lua.dist
parent890bf7ab7466264a1d334bc0aa8a84c22a4ebf56 (diff)
parentef9b86202eb5ed42cefe788b01b1f09895d6899e (diff)
downloadprosody-f823a63ce870f3b464e06d15a41e5ecbbc88b583.tar.gz
prosody-f823a63ce870f3b464e06d15a41e5ecbbc88b583.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions