Matt/onestlatech.github.io
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse source
This commit is contained in:
Kévin Dunglas 2019-12-10 00:14:19 +01:00
parent 80d86d9efa
commit 348f0086cb
No known key found for this signature in database
GPG key ID: 9D0C5D6EEB42C445
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
content/_index.md
View file

@ -297,7 +297,6 @@ Le format à respecter est : `[Prénom Nom](https://web-ou-reseau-social), fonct
* Nicolas Assing, développeur
* [Maxime Steinhausser](https://github.com/ogizanagi), développeur
* [Peio Roth](https://peio.now.sh/), développeur
<<<<<<< HEAD
* [Marc-Aurel Audoin](https://twitter.com/MarcAurel_), développeur
* Gaëtan Duchaussois, Admin sys
* [Boris Schapira](https://boris.schapira.dev), professionnel du Web
@ -335,9 +334,7 @@ Le format à respecter est : `[Prénom Nom](https://web-ou-reseau-social), fonct
* Nicolas Gourlé, développeur
* [Anthony GRASSIOT](https://twitter.com/antograssiot), développeur
* [Yohann Marillet](https://github.com/ymarillet), architecte d'applications / lead dev php/symfony
=======
* [Guillaume Blairon](https://twitter.com/_yom_), engineering manager
>>>>>>> Update _index.md
### Organisations