aboutsummaryrefslogtreecommitdiffstats
path: root/core/moduleapi.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-31 20:49:03 +0100
committerKim Alvefur <zash@zash.se>2013-10-31 20:49:03 +0100
commitd938c65ce63fcc22d915abcc5215efdc52b5cec4 (patch)
treefc4ccb38b95ca249345023b2a6b8dc0bf1054deb /core/moduleapi.lua
parent9fde274e2174f63d3f50e38f2992b6019a106ec7 (diff)
parentedc3624d3575688943cf8953d76f0c862189408f (diff)
downloadprosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.tar.gz
prosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.zip
Merge 0.10 -> trunk
Diffstat (limited to 'core/moduleapi.lua')
0 files changed, 0 insertions, 0 deletions