aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-12 12:52:55 +0100
committerKim Alvefur <zash@zash.se>2017-03-12 12:52:55 +0100
commit5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688 (patch)
tree63cd574c6106032332b41c5a2e4b08f81bffd916 /core
parent37da3cc72a7be5bc414ec7600860ec8e841ef1a0 (diff)
parentdf4695718555a55582503b8086d530241c2e1d0f (diff)
downloadprosody-5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688.tar.gz
prosody-5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions