projects
/
cacert-devel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52dfc5b
b513efa
)
Merge branch 'bug-1316' into testserver-stable
author
Benny Baumann
<BenBE@geshi.org>
Wed, 29 Oct 2014 08:10:59 +0000
(09:10 +0100)
committer
Benny Baumann
<BenBE@geshi.org>
Wed, 29 Oct 2014 08:10:59 +0000
(09:10 +0100)
1
2
includes/notary.inc.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/notary.inc.php
Simple merge