Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 7191:df4f52cabdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |