aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-06-12 20:06:30 +0200
committerKim Alvefur <zash@zash.se>2016-06-12 20:06:30 +0200
commitad4206686a546cb2a7423a4ab62c5d3c9a1ea199 (patch)
tree5235f98e4c6c1576bf426af7bafd6cc45c32a411 /core
parent8db3c0f7ee60372ae79c3bcd2d062f1b756f09e6 (diff)
parent41fc70c7cfc60fc8060b8e64ea5706ae1e5de6b8 (diff)
downloadprosody-ad4206686a546cb2a7423a4ab62c5d3c9a1ea199.tar.gz
prosody-ad4206686a546cb2a7423a4ab62c5d3c9a1ea199.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions