Mercurial > prosody-hg
diff core/moduleapi.lua @ 6908:047becf393ca
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parents | e813e8cf6046 |
| children | ecba5fee4867 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parents | e813e8cf6046 |
| children | ecba5fee4867 |