projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a34a6a1 0ee7420)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)
1  2 
plugins/mod_s2s/mod_s2s.lua patch | diff1 | diff2 | blob | history

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