aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-05-19 16:33:18 +0100
committerMatthew Wild <mwild1@gmail.com>2015-05-19 16:33:18 +0100
commit25aa5f3bb97650283386799a4bf8b36012aeacdf (patch)
tree14a722959d1179338adec58efd9e5d7fcfa58ada /plugins
parentebe83d27d3179fa5d3c1452a8633a49d85a94f60 (diff)
parent98d695f3a199cdf07d26f9c0ae7d23a56da157a1 (diff)
downloadprosody-25aa5f3bb97650283386799a4bf8b36012aeacdf.tar.gz
prosody-25aa5f3bb97650283386799a4bf8b36012aeacdf.zip
Merge with trunk
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions