projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60b0596
5360e1b
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Wed, 23 Dec 2015 11:11:07 +0000
(12:11 +0100)
committer
Kim Alvefur
<zash@zash.se>
Wed, 23 Dec 2015 11:11:07 +0000
(12:11 +0100)
1
2
certs/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
certs/Makefile
Simple merge
projects / prosody.git / commitdiff