Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 7179:bfa3b2ee384c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Feb 2016 15:24:20 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Feb 2016 15:24:20 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |