diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
commit | 4ec8a2f5b5961e90db28d92afd1f685966d8fe42 (patch) | |
tree | f90375b97b687b9dcb19e55c0bf48053c57549e7 /plugins/mod_disco.lua | |
parent | 4c6a84a00ef37846e432ba76e3771087d23cceb1 (diff) | |
parent | c8b213ff4f88ac6c0d21e58669d399d12f82c5b8 (diff) | |
download | prosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.tar.gz prosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions