Mercurial > prosody-hg
diff core/moduleapi.lua @ 7619:f5016c8985d7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 19 Aug 2016 22:49:36 +0200 |
| parents | 1da5a710848d |
| children | e9d7a409e236 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 19 Aug 2016 22:49:36 +0200 |
| parents | 1da5a710848d |
| children | e9d7a409e236 |