projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb73380 d510d25)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 4 Jan 2016 09:14:57 +0000 (09:14 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 4 Jan 2016 09:14:57 +0000 (09:14 +0000)
1  2 
plugins/mod_bosh.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_bosh.lua
Simple merge