Mercurial > prosody-hg
diff plugins/mod_mam/mamprefs.lib.lua @ 9136:07fc2c5c0c2e
Merge jonasw->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Aug 2018 16:58:21 +0200 |
| parents | 3eb4cafb3b64 |
| children | 173038306750 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Aug 2018 16:58:21 +0200 |
| parents | 3eb4cafb3b64 |
| children | 173038306750 |