projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c41a8a
18331b0
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Tue, 9 Sep 2014 12:42:33 +0000
(14:42 +0200)
committer
Kim Alvefur
<zash@zash.se>
Tue, 9 Sep 2014 12:42:33 +0000
(14:42 +0200)
1
2
core/stanza_router.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/stanza_router.lua
Simple merge