diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-30 13:12:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-30 13:12:16 +0200 |
commit | e747fa644137819e46e444b8ca605c727fa64d97 (patch) | |
tree | 188fe2fddec81c249b952dca48e7f61546e44351 /plugins/mod_disco.lua | |
parent | b124e4e22644b0f9d10ec7638d532fbff016e276 (diff) | |
parent | 75c19f9f6c36cb2fb954973f11825513030c6e54 (diff) | |
download | prosody-e747fa644137819e46e444b8ca605c727fa64d97.tar.gz prosody-e747fa644137819e46e444b8ca605c727fa64d97.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions