Software / code / prosody
Diff
util/vcard.lua @ 6799:4fc6b0a090bb
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:37 +0200 |
| parent | 6400:95241c0f9244 |
| child | 8382:e5d00bf4a4d5 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:37 +0200 |
| parent | 6400:95241c0f9244 |
| child | 8382:e5d00bf4a4d5 |