Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eeb5f17

Browse files
committedMar 13, 2019
Merge remote-tracking branch 'upstream/master' into asm-compile-tests
2 parents 5c7ec6c + 8bf1f1c commit eeb5f17

File tree

3,937 files changed

+27972
-23161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,937 files changed

+27972
-23161
lines changed
 

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
161161
Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com>
162162
Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
163163
Mukilan Thiagarajan <mukilanthiagarajan@gmail.com>
164+
Nathan West <Lucretiel@gmail.com> <lucretiel@gmail.com>
164165
Nathan Wilson <wilnathan@gmail.com>
165166
Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
166167
Neil Pankey <npankey@gmail.com> <neil@wire.im>

‎Cargo.lock

Lines changed: 113 additions & 60 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.