Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 8203:a7863f4aae65
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Aug 2017 15:24:53 +0200 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Aug 2017 15:24:53 +0200 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |