Mercurial > prosody-modules
diff mod_admin_web/admin_web/mod_admin_web.lua @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 8cb21ef24e5d |
| children | fc5df35a3fe4 |
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 8cb21ef24e5d |
| children | fc5df35a3fe4 |