aboutsummaryrefslogtreecommitdiffstats
path: root/util/xmppstream.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-27 14:08:32 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-27 14:08:32 +0100
commite68e90bd30e81a46052bcf33ea8da344dfc0557b (patch)
treea1568a41de954c6611e3334860644f96a2866121 /util/xmppstream.lua
parent2368529f517e1b3c1a038da50d569b112f61977c (diff)
parent79940f40e79e453383693bb7e2559e3e335b87dc (diff)
downloadprosody-e68e90bd30e81a46052bcf33ea8da344dfc0557b.tar.gz
prosody-e68e90bd30e81a46052bcf33ea8da344dfc0557b.zip
Merge 0.10 -> trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions