Mercurial > prosody-modules
diff mod_admin_web/admin_web/mod_admin_web.lua @ 1322:bf6796061037
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | e5441d46d6ff |
| children | 7dbde05b48a9 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | e5441d46d6ff |
| children | 7dbde05b48a9 |