aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
committerMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
commite9d37d780b2e50e4f3ed34d3c355d651c0375cb2 (patch)
tree3d0d78194ab5828d67c07bac2f07209054155de9 /prosody
parenta65cd04e353b849f6a3cda6ca746378dd309ee28 (diff)
parent15ee257b357d532f7c8dc1de83b0379b57203268 (diff)
downloadprosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.tar.gz
prosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.zip
Merge 0.10 -> trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions