Mercurial > prosody-modules
diff mod_register_json/mod_register_json.lua @ 467:266bf13729ae
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 01 Nov 2011 18:09:46 +0100 |
| parents | f0fafd19fd72 |
| children | 84e992f70ba3 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 01 Nov 2011 18:09:46 +0100 |
| parents | f0fafd19fd72 |
| children | 84e992f70ba3 |