aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-22 15:03:02 +0100
committerKim Alvefur <zash@zash.se>2016-01-22 15:03:02 +0100
commit931549f781d8a0cb98af05b98cf00880dca5fb9f (patch)
tree6826436cb243da87ede7abff06607216fa25fa4b /plugins/muc
parentb0864f247d26d45d1a2e6f0dc4958254ca8bcb47 (diff)
parent6116ba8cfbeff29bd3c4cedd1b05babec47e1507 (diff)
downloadprosody-931549f781d8a0cb98af05b98cf00880dca5fb9f.tar.gz
prosody-931549f781d8a0cb98af05b98cf00880dca5fb9f.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
0 files changed, 0 insertions, 0 deletions