Mercurial > prosody-modules
diff mod_default_vcard/mod_default_vcard.lua @ 927:a9dfa7232d88
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 52f2188ec47d |
| children | 7236cdec3ea1 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 52f2188ec47d |
| children | 7236cdec3ea1 |