projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9ea173
546c1a3
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Sat, 30 Jan 2016 13:18:42 +0000
(14:18 +0100)
committer
Kim Alvefur
<zash@zash.se>
Sat, 30 Jan 2016 13:18:42 +0000
(14:18 +0100)
1
2
CHANGES
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CHANGES
Simple merge
projects / prosody.git / commitdiff