Mercurial > prosody-hg
diff plugins/mod_privacy.lua @ 7460:726b088f9408
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Jun 2016 15:11:06 +0200 |
| parents | 769a3577dd85 94af49ad657e |
| children | cac4bd0d3335 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Jun 2016 15:11:06 +0200 |
| parents | 769a3577dd85 94af49ad657e |
| children | cac4bd0d3335 |