Skip to content

Commit

Permalink
[dev.boringcrypto] all: merge master into dev.boringcrypto
Browse files Browse the repository at this point in the history 
Change-Id: I9246c8228d38559c40e69fa403fa946ac1b31dbe
  • Loading branch information
@FiloSottile
FiloSottile committed Feb 8, 2019
2 parents 14c64db + 7ccd358 commit 4ed8ad4
Show file tree
Hide file tree
Showing 1,404 changed files with 82,035 additions and 33,671 deletions.
3 changes: 2 additions & 1 deletion AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ Eivind Uggedal <eivind@uggedal.com>
Elbert Fliek <efliek@gmail.com>
Eldar Rakhimberdin <ibeono@gmail.com>
Elena Grahovac <elena@grahovac.me>
Elias Naur <elias.naur@gmail.com>
Elias Naur <mail@eliasnaur.com> <elias.naur@gmail.com>
Elliot Morrison-Reed <elliotmr@gmail.com>
Emerson Lin <linyintor@gmail.com>
Emil Hessman <emil@hessman.se>
Expand Down Expand Up @@ -1304,6 +1304,7 @@ Sven Almgren <sven@tras.se>
Sylvain Zimmer <sylvain@sylvainzimmer.com>
Syohei YOSHIDA <syohex@gmail.com>
Szabolcs Nagy <nsz@port70.net>
Taavi Kivisik <taavi.kivisik@gmail.com>
Tad Fisher <tadfisher@gmail.com>
Tad Glines <tad.glines@gmail.com>
Taj Khattra <taj.khattra@gmail.com>
Expand Down
Loading

0 comments on commit 4ed8ad4

Please sign in to comment.