projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3649d95 e2289a8)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:00 +0000 (14:15 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:00 +0000 (14:15 +0100)
1  2 
plugins/mod_c2s.lua patch | diff1 | diff2 | blob | history
plugins/mod_s2s/mod_s2s.lua patch | diff1 | diff2 | blob | history

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