Mercurial > prosody-hg
diff plugins/mod_mam/mamprefs.lib.lua @ 7868:11fcdef5022f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 26 Jan 2017 19:47:33 +0100 |
| parents | e429982940fc |
| children | 9ff791c9f069 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 26 Jan 2017 19:47:33 +0100 |
| parents | e429982940fc |
| children | 9ff791c9f069 |