summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Danis <frederic.danis.oss@gmail.com>2020-04-07 19:32:08 +0200
committerThomas Haller <thaller@redhat.com>2020-04-08 07:39:18 +0200
commitfb6812fcc360eb838bbdaa6db5dfe1b9aee33f84 (patch)
tree9e61a6c6426893d993f32ca845af350c62886994
parent6f808a9ecbf931319330826a7a7f41f05659c6b5 (diff)
downloadNetworkManager-fb6812fcc360eb838bbdaa6db5dfe1b9aee33f84.tar.gz
license: Add Frédéric to RELICENSE.md
I, Frédéric Danis, agree to relicense my contributions to NetworkManager as LGPL-2.1+ as proposed by Thomas Haller. Some of my work may be held under copyright by Sigfox or Collabora Ltd. I do not speak for those entities. Signed-off-by: Frédéric Danis <frederic.danis.oss@gmail.com> https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/462
-rw-r--r--.mailmap1
-rw-r--r--RELICENSE.md1
2 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 094ca1d40a..69065df915 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Fran Diéguez <frandieguez@gnome.org>
Fran Diéguez <frandieguez@gnome.org> <fran.dieguez@mabishu.com>
Francisco Javier F. Serrador <serrador@cvs.gnome.org> <serrador@openshine.com>
Frédéric Danis <frederic.danis.oss@gmail.com> <frederic.danis.external@sigfox.com>
+Frédéric Danis <frederic.danis.oss@gmail.com> <frederic.danis@collabora.com>
Gabor Kelemen <kelemeng@gnome.hu> <kelemeng@gnome.org>
Gene Czarcinski <gene@czarc.net> <czar@acm.org>
Giovanni Campagna <gcampagna@src.gnome.org> <scampa.giovanni@gmail.com>
diff --git a/RELICENSE.md b/RELICENSE.md
index f7538ac939..1db96d3099 100644
--- a/RELICENSE.md
+++ b/RELICENSE.md
@@ -80,6 +80,7 @@ Consent/Disapproval List
- [Y] Dan Williams <dcbw@redhat.com> (Red Hat, Inc.)
- [Y] Dan Winship <danw@redhat.com> (Red Hat, Inc.)
- [Y] Francesco Giudici <fgiudici@redhat.com> (Red Hat, Inc.)
+- [Y] Frédéric Danis <frederic.danis.oss@gmail.com> (Collabora Ltd, Sigfox)
- [Y] Iñigo Martínez <inigomartinez@gmail.com>
- [Y] Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
- [Y] Jan Tojnar <jtojnar@gmail.com>