projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b1c141f
9f1c9a4
)
Merging more s2s
author
Matthew Wild
<mwild1@gmail.com>
Fri, 24 Oct 2008 06:36:48 +0000
(07:36 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 24 Oct 2008 06:36:48 +0000
(07:36 +0100)
1
2
core/stanza_router.lua
patch
|
diff1
|
diff2
|
blob
|
history
main.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/stanza_router.lua
Simple merge
diff --cc
main.lua
Simple merge
projects / prosody.git / commitdiff