Mercurial > prosody-modules
comparison mod_tcpproxy/web/xmpp.io.js @ 831:0c3638673464
Merge upstream with my local LDAP work
author | Rob Hoelz <rob@hoelz.ro> |
---|---|
date | Tue, 18 Sep 2012 00:31:42 +0200 (2012-09-17) |
parents | f2f9b965d1ad |
children | 7dbde05b48a9 |
comparison
equal
deleted
inserted
replaced
830:f160166612c2 | 831:0c3638673464 |
---|