diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-01 22:38:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-01 22:38:02 +0200 |
commit | 046661149f85faca61b40fee3dcaf68dea771c36 (patch) | |
tree | 54caf551ee6f37067537da4cfe6cdd84050f92a0 /plugins/adhoc | |
parent | dfbcefb210b58d48efef68016ba296323a193a88 (diff) | |
parent | ac4e9ca0cc8bd6b946c0820cf24a39c333531a54 (diff) | |
download | prosody-046661149f85faca61b40fee3dcaf68dea771c36.tar.gz prosody-046661149f85faca61b40fee3dcaf68dea771c36.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions