diff options
author | Kim Alvefur <zash@zash.se> | 2015-01-26 15:27:19 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-01-26 15:27:19 +0100 |
commit | 887c81f09119032163fda9826df0e20d067c03e0 (patch) | |
tree | c658232ecea6713ee92d5ad4937203a4fe06a827 /plugins/adhoc | |
parent | cd0dd3f92b02d855c98701792c179d02ad12bf24 (diff) | |
parent | 26854f710c5d0c038738ddfda11406ce13a4536a (diff) | |
download | prosody-887c81f09119032163fda9826df0e20d067c03e0.tar.gz prosody-887c81f09119032163fda9826df0e20d067c03e0.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions