projects / oweals / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b1a3030) | patch
Fixed merge nonsense
authorAlex Gaynor <alex.gaynor@gmail.com>
Thu, 20 Apr 2017 22:47:53 +0000 (18:47 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 22 May 2017 12:03:22 +0000 (08:03 -0400)
commit2b10cb5c0e21bce283f4c73477d97f6bd8b4a7ec
tree16f83a8f0836a4d1fd3edfb49a1b87f6afe768b7tree | snapshot
parentb1a3030e3705f497a69ab72be433bdbe85affe6acommit | diff
Fixed merge nonsense

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
test/ct_test.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.