Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 7061:eda0feeaf759
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:16:08 +0100 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:16:08 +0100 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |