Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 6621:352fa2cae1c9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 6b3eb1611587 |
| children | e465b584547b |