Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 7195:39b7ea9141c0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Feb 2016 15:40:35 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |