Mercurial > prosody-hg
diff core/moduleapi.lua @ 7191:df4f52cabdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | af26e8eb591f |
| children | 1da5a710848d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | af26e8eb591f |
| children | 1da5a710848d |