Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 5356:97197ca60cb2
Merge...
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2013 20:35:59 +0000 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2013 20:35:59 +0000 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |