diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-26 16:57:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-26 16:57:53 +0200 |
commit | 95f854650407ddb214a40805a5d7c8567b6dcc92 (patch) | |
tree | 2151226ea95bb3a632b411087eb5cc28f6c81ded /plugins/mod_vcard.lua | |
parent | cca5b1dec7762e7f5549a2b387a72e9fda602809 (diff) | |
parent | 5c1d761d865bd10e47433b33a5c6c2a2287c8e27 (diff) | |
download | prosody-95f854650407ddb214a40805a5d7c8567b6dcc92.tar.gz prosody-95f854650407ddb214a40805a5d7c8567b6dcc92.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_vcard.lua')
0 files changed, 0 insertions, 0 deletions