diff options
author | Kim Alvefur <zash@zash.se> | 2015-08-26 13:17:37 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-08-26 13:17:37 +0200 |
commit | f0447816d8e4e81771b73d0d025a61221e290e3f (patch) | |
tree | 9dc703a47bdb80713dc5c5926a4215a12b0337fe /util/vcard.lua | |
parent | e58beaa308ceb3ce53acdac6c299c7f3a7d019c8 (diff) | |
parent | 0049dd0d5f58affe39b8acb0ae460bbd42ec4a8f (diff) | |
download | prosody-f0447816d8e4e81771b73d0d025a61221e290e3f.tar.gz prosody-f0447816d8e4e81771b73d0d025a61221e290e3f.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/vcard.lua')
0 files changed, 0 insertions, 0 deletions