aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-05 23:03:09 +0100
committerKim Alvefur <zash@zash.se>2016-12-05 23:03:09 +0100
commitdec1fd604cc7dedef23b3885013fa821492ef86b (patch)
tree4c6789585cf1e7ca711eb7c4253a5da0ef37a9b8 /core
parent08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb (diff)
parent00e5c2d7d326e18232ac3188001f805fdab3836f (diff)
downloadprosody-dec1fd604cc7dedef23b3885013fa821492ef86b.tar.gz
prosody-dec1fd604cc7dedef23b3885013fa821492ef86b.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions