Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 5194:9dca5bd5c2be
Merge with a merge (or something)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:02:27 +0000 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:02:27 +0000 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |