diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-02-24 15:22:34 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-02-24 15:22:34 +0000 |
commit | c166ec17c2c8bf911877b5810de2555a50afe3ef (patch) | |
tree | bd901b2855478c2157ca69f3a143650499ffe8ea /plugins/mod_vcard.lua | |
parent | 01a5895abafc01cde29b8ccac63137af370caa27 (diff) | |
parent | a65615d8f2430de97cb1c426a018f84e3c2d6f99 (diff) | |
download | prosody-c166ec17c2c8bf911877b5810de2555a50afe3ef.tar.gz prosody-c166ec17c2c8bf911877b5810de2555a50afe3ef.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_vcard.lua')
0 files changed, 0 insertions, 0 deletions