Mercurial > prosody-hg
comparison plugins/mod_vcard.lua @ 5946:04f2138dfa87
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:43 +0000 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |
comparison
equal
deleted
inserted
replaced
| 5940:783107f85ea0 | 5946:04f2138dfa87 |
|---|
