diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-01-10 16:33:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 16:33:10 -0700 |
| commit | 93141b7ed40a9c36bbba6b783e690edbd57b8488 (patch) | |
| tree | 0a008988f17fb3effc87e94830fe73682b5fb4fb | |
| parent | beac5d5c5313e6f0caff76d6a52faf0e8318d7b8 (diff) | |
| parent | df1144ab6f9f3d6d46ae05278e7d4e44b8f6d089 (diff) | |
| download | numpy-93141b7ed40a9c36bbba6b783e690edbd57b8488.tar.gz | |
Merge pull request #8466 from charris/update-mailmap
MAINT: Update mailmap entries.
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | doc/release/1.12.0-notes.rst | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -66,6 +66,7 @@ Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeni@burovski.me Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com> Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org> Friedrich Dunne <dunneff@tcd.ie> dunneff <dunneff@tcd.ie> +Frederic Bastien <nouiz@nouiz.org> Frederic <nouiz@nouiz.org> Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org> Gerrit Holl <gerrit.holl@utoronto.ca> Gerrit Holl <g.holl@reading.ac.uk> Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com> diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst index 05d7d347e..d6c61e240 100644 --- a/doc/release/1.12.0-notes.rst +++ b/doc/release/1.12.0-notes.rst @@ -539,7 +539,7 @@ names contributed a patch for the first time. * Eric Quintero + * Eric Wieser + * Erik M. Bray -* Frederic Bastien + +* Frederic Bastien * Friedrich Dunne + * Gerrit Holl * Golnaz Irannejad + |