projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c18153e 59ded0b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:30:53 +0000 (13:30 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:30:53 +0000 (13:30 +0200)
1  2 
plugins/mod_s2s/mod_s2s.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_s2s/mod_s2s.lua
Simple merge