aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-07 22:44:12 +0100
committerKim Alvefur <zash@zash.se>2017-03-07 22:44:12 +0100
commitb0eec64a3f56ee4020f2d328e6d51a07f45cab53 (patch)
treeaecd89ed33910dfc20d71cdcdece8d1c72673efa /plugins
parent6403594a10e820f81e9bdffed95d947b7350cca9 (diff)
parent255423ab565b6c7f8653159ac6852deac16d2a48 (diff)
downloadprosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.tar.gz
prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions