projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b12023 5874ba5)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 5 Feb 2016 00:04:11 +0000 (00:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 5 Feb 2016 00:04:11 +0000 (00:04 +0000)
1  2 
core/moduleapi.lua patch | diff1 | diff2 | blob | history

diff --cc core/moduleapi.lua
Simple merge