diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-23 00:22:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-23 00:22:36 +0200 |
commit | a4b456c8577e5188da086ce16738ed019351ee1f (patch) | |
tree | d9a05404bdeb962960f8fc96ebdae4c569d318c5 /plugins/mod_disco.lua | |
parent | 13d11d6735a28f23475727483b8c9b13f93d0f81 (diff) | |
parent | ef460cbd97a813669486cbd8b23a5a4a012cac70 (diff) | |
download | prosody-a4b456c8577e5188da086ce16738ed019351ee1f.tar.gz prosody-a4b456c8577e5188da086ce16738ed019351ee1f.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions