diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-15 10:48:11 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-15 10:48:11 +0200 |
commit | f3eea8785c0b018fafb3f06fb507d079bf7c5aae (patch) | |
tree | fe9b8ddc6deba4135441975ae2d3f6af34d7248a /plugins/mod_vcard.lua | |
parent | 66da3ac69a0c272a954278914cd7c4d7061bc344 (diff) | |
parent | ddab3471659587368ae35104de4d62776484352a (diff) | |
download | prosody-f3eea8785c0b018fafb3f06fb507d079bf7c5aae.tar.gz prosody-f3eea8785c0b018fafb3f06fb507d079bf7c5aae.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_vcard.lua')
0 files changed, 0 insertions, 0 deletions