Mercurial > prosody-modules
diff mod_register_json/mod_register_json.lua @ 613:b5a8e8492570
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Feb 2012 15:17:16 +0000 |
| parents | 121762432eb1 |
| children | 6f0e0d6790a7 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Feb 2012 15:17:16 +0000 |
| parents | 121762432eb1 |
| children | 6f0e0d6790a7 |