projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
764c3d0
53a00f3
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Fri, 25 Sep 2015 16:11:24 +0000
(18:11 +0200)
committer
Kim Alvefur
<zash@zash.se>
Fri, 25 Sep 2015 16:11:24 +0000
(18:11 +0200)
1
2
tools/xep227toprosody.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/xep227toprosody.lua
Simple merge