Commit Graph

233 Commits

Author SHA1 Message Date
Rassaby Ludovic 2d4f0518dd Conflit Resolve toma.txt 2024-10-22 09:41:42 +04:00
GRONDIN Clarel f53984f064 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:39 +04:00
Dorian BOYER c208f489b7 test 2024-10-22 09:41:37 +04:00
AHOVEY Saint-George b98bcdef3e resol osecouuuur 2024-10-22 09:41:29 +04:00
3thernitydev 81de4779c7 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:22 +04:00
GRONDIN Clarel 58a6c7d37e Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:15 +04:00
3thernitydev 7c039664df Fix conflicts on despacito.txt 2024-10-22 09:41:13 +04:00
Krolaf 04e332a91a Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 07:41:07 +02:00
GRONDIN Clarel b8f91075c5 résolution conflit nous avons tout les deux raison 2024-10-22 09:41:07 +04:00
Krolaf 6d6942a4dc jerem_modif 2024-10-22 07:40:56 +02:00
Dorian BOYER ef092673e1 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:40:13 +04:00
Dorian BOYER 225fe267a3 testdodocheun 2024-10-22 09:39:50 +04:00
Ramassy Cheun d6c65328bf Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:39:23 +04:00
Ramassy Cheun 5627168729 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:39:05 +04:00
Jeremy Hoarau 78d3970c4e Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:39:15 +04:00
Ramassy Cheun b0feb191e5 modifiction du fichier Cheun.md 2024-10-22 09:38:51 +04:00
Jeremy Hoarau 1f8cf00c6b Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:38:26 +04:00
Jeremy Hoarau 61029654f5 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:38:05 +04:00
Toma 52c6ca7e21 up 2024-10-22 09:36:49 +04:00
Rassaby Ludovic b12e6fdcec Add text2 toma.txt 2024-10-22 09:36:32 +04:00
Krolaf 6b60db95bd Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 07:35:06 +02:00
Krolaf 18540f73f8 jerem_modiff 2024-10-22 07:34:53 +02:00
Ramassy Cheun 4522ea3e28 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:34:48 +04:00
Rassaby Ludovic 829037d271 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:34:43 +04:00
Ramassy Cheun aad7a34411 modification du fichier 2024-10-22 09:34:30 +04:00
Rassaby Ludovic 6141a60c85 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:34:22 +04:00
Rassaby Ludovic 31d3040e3a Add text toma.txt 2024-10-22 09:34:17 +04:00
Krolaf ced5bdfeef jerem_modif 2024-10-22 07:33:58 +02:00
Jeremy Hoarau c8701f7b05 MàJ Jeremy.txt 2024-10-22 09:33:30 +04:00
Pedre Gabriel 2332f98860 collaborationavectomy 2024-10-22 09:33:25 +04:00
Dorian BOYER 16c867f2a2 dodo 2024-10-22 09:33:23 +04:00
Dorian BOYER 6edd3c71ea Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:31:28 +04:00
Dorian BOYER 767a000daf dodo.txt 2024-10-22 09:31:09 +04:00
Toma bd5326bde5 up 2024-10-22 09:30:20 +04:00
Théo CELEMANI 6899e04809 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:29:40 +04:00
AH-YONG Emjy 1dc6f8e74b Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:28:08 +04:00
GRONDIN Clarel 50c076f785 push ligne 1 lou.txt 2024-10-22 09:27:57 +04:00
AH-YONG Emjy 58d823dd66 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:27:57 +04:00
Sar_Tron e25bd3c3a3 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:27:48 +04:00
AHOVEY Saint-George 13b3ff0bc7 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:27:42 +04:00
AH-YONG Emjy a487d6e725 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:27:41 +04:00
Sar_Tron 1c28bb8146 lou1 2024-10-22 09:27:41 +04:00
3thernitydev bca391148d add a line in despacito.txt 2024-10-22 09:26:48 +04:00
Théo CELEMANI 934f4631c0 Modife sgg 2024-10-22 09:26:21 +04:00
Mat911 661b672cd6 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:26:18 +04:00
Mat911 9539dd19ea add la musica 2024-10-22 09:25:59 +04:00
Dorian BOYER ecbb6d8617 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:25:37 +04:00
Dorian BOYER 97336fc36a dodo 2024-10-22 09:25:24 +04:00
AH-YONG Emjy f163c6c18b to 2024-10-22 09:25:11 +04:00
AHOVEY Saint-George 4eae98bb43 osecouuuuur 2024-10-22 09:25:08 +04:00