Mercurial > prosody-modules
diff mod_admin_web/admin_web/mod_admin_web.lua @ 931:e20e94d75fe3
Merge (someone needs to remember to pull...)
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Tue, 12 Mar 2013 19:09:26 +0100 |
| parents | e3ad5f3aa6d4 |
| children | d643c385d3f6 |
