Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 7195:39b7ea9141c0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |