Merge conflict

This commit is contained in:
Alexandre Balmes 2019-12-10 00:25:38 +01:00
parent 30d89c8ac4
commit 5275a432f6
No known key found for this signature in database
GPG key ID: 3F70833B886BA122

View file

@ -297,6 +297,7 @@ Le format à respecter est : `[Prénom Nom](https://web-ou-reseau-social), fonct
* [Rodrigue Villetard](https://twitter.com/gorghoa) * [Rodrigue Villetard](https://twitter.com/gorghoa)
* [Matthieu Werner](https://twitter.com/KeatonSeven), Consultant Web [JoliCode](https://jolicode.com/) * [Matthieu Werner](https://twitter.com/KeatonSeven), Consultant Web [JoliCode](https://jolicode.com/)
* Séverine Wiltgen, SRE Mediapart * Séverine Wiltgen, SRE Mediapart
* [Benjamin Winckell](https://twitter.com/oh_meeen), Developpeur Lead
* [Yvain Liechti](https://twitter.com/ryuran78), développeur frontend * [Yvain Liechti](https://twitter.com/ryuran78), développeur frontend
* Nicolas Assing, développeur * Nicolas Assing, développeur
* [Maxime Steinhausser](https://github.com/ogizanagi), développeur * [Maxime Steinhausser](https://github.com/ogizanagi), développeur