diff options
author | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
commit | 42f8b3615eb02e7c823055ce186fdb3424165160 (patch) | |
tree | 661dfb5bfa698d4ee4646df7df94ac8c78a984a0 /plugins/adhoc/mod_adhoc.lua | |
parent | 36da2e1aabdd130123e43060a3e606361299690f (diff) | |
parent | d8d5861feced162f170d17e845f8617031c2097c (diff) | |
download | prosody-42f8b3615eb02e7c823055ce186fdb3424165160.tar.gz prosody-42f8b3615eb02e7c823055ce186fdb3424165160.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
0 files changed, 0 insertions, 0 deletions