From fb38106e2fc4cec51f04306fbfea71447648ce58 Mon Sep 17 00:00:00 2001 From: Alexandre Balmes Date: Tue, 10 Dec 2019 00:25:38 +0100 Subject: [PATCH] Merge conflict --- content/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/_index.md b/content/_index.md index 634d5e8..90bb7a2 100644 --- a/content/_index.md +++ b/content/_index.md @@ -296,6 +296,7 @@ Le format à respecter est : `[Prénom Nom](https://web-ou-reseau-social), fonct * [Rodrigue Villetard](https://twitter.com/gorghoa) * [Matthieu Werner](https://twitter.com/KeatonSeven), Consultant Web [JoliCode](https://jolicode.com/) * Séverine Wiltgen, SRE Mediapart +* [Benjamin Winckell](https://twitter.com/oh_meeen), Developpeur Lead * [Yvain Liechti](https://twitter.com/ryuran78), développeur frontend * Nicolas Assing, développeur * [Maxime Steinhausser](https://github.com/ogizanagi), développeur