diff options
author | Kim Alvefur <zash@zash.se> | 2015-03-27 00:28:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-03-27 00:28:16 +0100 |
commit | 77b653d31a2a47e92cae7ddfa18961bdc2b365e8 (patch) | |
tree | f929631061005d60677809a5c9167c4ba81a51c1 /plugins/adhoc/adhoc.lib.lua | |
parent | 603d0df6e2829a8d6dd5d359fd41e09b47469965 (diff) | |
parent | 5cc3f03d5aab0516358addd949281c2e3fa70688 (diff) | |
download | prosody-77b653d31a2a47e92cae7ddfa18961bdc2b365e8.tar.gz prosody-77b653d31a2a47e92cae7ddfa18961bdc2b365e8.zip |
Merge with merge
Diffstat (limited to 'plugins/adhoc/adhoc.lib.lua')
0 files changed, 0 insertions, 0 deletions