diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-18 02:22:48 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-18 02:22:48 +0200 |
commit | 1324a994958a3d4206640db57b11a7a6d504d83a (patch) | |
tree | 361f642064745fd1a6601050e7573062ff65e2ad /plugins/mod_disco.lua | |
parent | 04368a22ef17c788d0a734b594f206a3c25f82fc (diff) | |
parent | e9fa1d1db3a14e8b0d989c3c3e983521034ad38c (diff) | |
download | prosody-1324a994958a3d4206640db57b11a7a6d504d83a.tar.gz prosody-1324a994958a3d4206640db57b11a7a6d504d83a.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions