Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 7549:d5f8a56eda4c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 10 Aug 2016 17:00:10 +0200 |
| parents | cf53081ce767 |
| children | 980606856882 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 10 Aug 2016 17:00:10 +0200 |
| parents | cf53081ce767 |
| children | 980606856882 |