diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-19 17:10:42 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-19 17:10:42 +0200 |
commit | 333708589f83a06ee69fd526be3b21843f948a57 (patch) | |
tree | 63c64dc8427c6d987cd53d489e228d097b87612f /plugins/mod_welcome.lua | |
parent | 172706f3e6df0b4ef6443ebd276772cadad43596 (diff) | |
parent | 75be55d7bd43bb415847f3e871bb81c8699a2967 (diff) | |
download | prosody-333708589f83a06ee69fd526be3b21843f948a57.tar.gz prosody-333708589f83a06ee69fd526be3b21843f948a57.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_welcome.lua')
0 files changed, 0 insertions, 0 deletions