Mercurial > prosody-hg
comparison plugins/adhoc/mod_adhoc.lua @ 7885:236b5a6154b2
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 04 Feb 2017 01:08:27 +0100 |
| parents | be87ab2d611c |
| children | 77e59f8057bf |
comparison
equal
deleted
inserted
replaced
| 7878:2fdb7b3648d8 | 7885:236b5a6154b2 |
|---|
