Mercurial > prosody-hg
diff plugins/mod_mam/mamprefs.lib.lua @ 8185:e89320b8a789
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 28 Jul 2017 23:47:38 +0100 |
| parents | a1e88642411d |
| children | aa6497031924 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 28 Jul 2017 23:47:38 +0100 |
| parents | a1e88642411d |
| children | aa6497031924 |