diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:22:05 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:22:05 +0200 |
| commit | 6ddb0363c5c9bb147f9a4fe0ba683bdba20b5389 (patch) | |
| tree | c7d8680e61ef0e32a358d199ad98fe838594d085 /test/testdata/known_roots/US.DigiCert SHA2 High Assurance Server CA.pem | |
| parent | e3fd2e3fc202ce18b90ac4ca96ac8264bed79569 (diff) | |
| parent | 732aaa8f2c2d57e8a5ad989fee0ba7b8c3c82479 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/fsync4' into origin-master
Conflicts:
src/catlfish.erl
Diffstat (limited to 'test/testdata/known_roots/US.DigiCert SHA2 High Assurance Server CA.pem')
0 files changed, 0 insertions, 0 deletions