Mercurial > prosody-hg
diff util/jid.lua @ 7062:90e8bbfbaabd
tests: Fix merge, modulemanager test was removed
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:20:02 +0100 |
| parents | 7f76c77ddcb8 |
| children | 1859e07ae082 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jan 2016 16:20:02 +0100 |
| parents | 7f76c77ddcb8 |
| children | 1859e07ae082 |