Mercurial > prosody-modules
diff mod_mam/mamprefs.lib.lua @ 2115:2ae5286f1b9a
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 17 Mar 2016 12:11:12 +0000 |
| parents | d44ac0756c46 |
| children | 34ec7bde5203 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 17 Mar 2016 12:11:12 +0000 |
| parents | d44ac0756c46 |
| children | 34ec7bde5203 |