projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
36c567e
ea83efa
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Tue, 26 Jan 2016 13:15:38 +0000
(14:15 +0100)
committer
Kim Alvefur
<zash@zash.se>
Tue, 26 Jan 2016 13:15:38 +0000
(14:15 +0100)
1
2
plugins/mod_s2s/mod_s2s.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/mod_s2s/mod_s2s.lua
Simple merge