diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
commit | 2220edd813cc4f6558f71aeca55dbf082271bb9f (patch) | |
tree | f9ef6854b63e7638dee3dd6ec46d6301d009494a /plugins/adhoc/mod_adhoc.lua | |
parent | d6070b967803d34d9a016b13d87f769c37c8bbfb (diff) | |
parent | d71189a4a66a335197d7ece3e2ba7e465c94b06e (diff) | |
download | prosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.tar.gz prosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
0 files changed, 0 insertions, 0 deletions