Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 6965:5360bdf93fce
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Dec 2015 16:13:33 +0000 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Dec 2015 16:13:33 +0000 |
| parents | 6b3eb1611587 |
| children | e465b584547b |