diff options
| author | jptha-guest <guillonneau.jeanpaul@free.fr> | 2019-03-19 22:24:30 +0100 |
|---|---|---|
| committer | jptha-guest <guillonneau.jeanpaul@free.fr> | 2019-03-19 22:24:30 +0100 |
| commit | 6680898498c2df743abd8412bbd074bcd518b009 (patch) | |
| tree | 64a8a705de997022e9a04f6f213b2fd9c83a2447 | |
| parent | 4bb08037817dfdec1ee9d2f64fbcfdffa039b57b (diff) | |
| parent | d2360dce133c954c6f2ea82bd055cf6e9ba3160a (diff) | |
Merge branch 'master' of salsa.debian.org:webmaster-team/webwml
| -rw-r--r-- | english/intro/organization.data | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/english/intro/organization.data b/english/intro/organization.data index 565d5244102..485ecf1216a 100644 --- a/english/intro/organization.data +++ b/english/intro/organization.data @@ -153,7 +153,6 @@ <member>Aurelien Jarno <member>Joachim Breitner <member>Kurt Roeckx - <member>Marc Brockschmidt <member>Mehdi Dogguy <member>Philipp Kern <job <a name="buildd-adm"><gettext domain="organization">Buildd administration</gettext></a>> <var><architecture></var>@buildd.debian.org @@ -167,7 +166,6 @@ <member>Konstantinos Margaritis <member>Kurt Roeckx <member>LaMont Jones - <member>Marc Brockschmidt <member>Michael Banck <member>Peter De Schrijver <member>Philipp Kern @@ -424,14 +422,14 @@ <member>Sean Whitton<delegate_male> <job <a name="dsa" href="https://dsa.debian.org/"><gettext domain="organization">System Administration</gettext></a>> <genericemail debian-admin@lists.debian.org> <delegationmail 1518118817.822954.1264430288.6415E1F1@webmail.messagingengine.com> <note <gettext domain="organization">This is the address to use when encountering problems on one of Debian's machines, including password problems or you need a package installed.</gettext>> + <member>Aurelien Jarno<delegate_male> <member>Héctor Orón Martínez<delegate_male> + <member>Julien Cristau<delegate_male> <member>Luca Filipozzi<delegate_male> <member>Martin Zobel-Helas<delegate_male> + <member>Paul Wise<delegate_male> <member>Peter Palfrader<delegate_male> <member>Tollef Fog Heen<delegate_male> - <member>Paul Wise<delegate_male> - <member>Julien Cristau<delegate_male> - <member>Aurelien Jarno<delegate_male> <note <gettext domain="organization">If you have hardware problems with Debian machines, please see <a href="https://db.debian.org/machines.cgi">Debian Machines</a> page, it should contain per-machine administrator information.</gettext>> <job <a name="db" href="https://db.debian.org/"><gettext domain="organization">LDAP Developer Directory Administrator</gettext></a>> <genericemail admin@db.debian.org> <job <a name="mirrors" href="$(HOME)/mirror/"><gettext domain="organization">Mirrors</gettext></a>> <genericemail mirrors@debian.org> |