Mercurial > prosody-hg
diff plugins/mod_mam/mod_mam.lua @ 9675:7d8e08f80dbd
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 02 Dec 2018 02:38:36 +0100 |
| parents | ed5a5ddcef17 |
| children | 39ee70fbb009 ddc07fb8dcd4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 02 Dec 2018 02:38:36 +0100 |
| parents | ed5a5ddcef17 |
| children | 39ee70fbb009 ddc07fb8dcd4 |