aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-03 16:05:34 +0100
committerKim Alvefur <zash@zash.se>2016-03-03 16:05:34 +0100
commit411cb70495af9f70588fa21cf6ca607e3bae9981 (patch)
tree0e5182283ab5973a6cab6ea5667024cdd2f8a80a /core
parent5951bb0a05ba1cef7bcdf527e510f1dc6463060c (diff)
parent31c0a34728dfc3f72cb7fe2072929c339f3625cf (diff)
downloadprosody-411cb70495af9f70588fa21cf6ca607e3bae9981.tar.gz
prosody-411cb70495af9f70588fa21cf6ca607e3bae9981.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions