diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
commit | 0bad074e8621bf2537f597c0ea45718dbddd8f12 (patch) | |
tree | 1f8626c471d0a192eaa46cc4ea40325a43a5469f /plugins/mod_disco.lua | |
parent | 37913e5ce81c5e0b404aa2389102e0a30b00c111 (diff) | |
parent | ce1271df1d153a41fb7a063e983dd51ab9226ebb (diff) | |
download | prosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.tar.gz prosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions