Mercurial > prosody-modules
comparison mod_register_json/mod_register_json.lua @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 16da8cd69715 |
| children | ea6641deec12 |
comparison
equal
deleted
inserted
replaced
| 413:e4d33cdfed21 | 416:10ff12fa82e2 |
|---|