Commit Graph

189 Commits

Author SHA1 Message Date
AHOVEY Saint-George 45946d9d69 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 10:16:38 +04:00
AHOVEY Saint-George 3bc4d6b386 repertoire 2024-10-22 10:16:13 +04:00
AH-YONG Emjy f1900b0ffc Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 10:16:04 +04:00
AH-YONG Emjy c1e07a776b emjy 2024-10-22 10:15:56 +04:00
Théo CELEMANI 5737227c7e Création fichier dossier Theo 2024-10-22 10:15:43 +04:00
Mat911 4630ba94ea add la musica 2024-10-22 10:11:22 +04:00
Toma df7cc9cd64 up toma 2024-10-22 10:10:33 +04:00
Ramassy Cheun 536850294a rectification erreur 2024-10-22 09:50:54 +04:00
Théo CELEMANI 86e7c8af06 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:46:27 +04:00
Théo CELEMANI 8f6d577c4f resolution conflict 2024-10-22 09:45:59 +04:00
Théo CELEMANI fd3749ba76 resolution conflict 2024-10-22 09:45:00 +04:00
Rassaby Ludovic 211b23b070 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:43:56 +04:00
Pedre Gabriel 86c96b8527 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:51:16 +04:00
Pedre Gabriel b784e7c243 resolutionconflit 2024-10-22 09:51:10 +04:00
Rassaby Ludovic 10415c8acc Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:43:42 +04:00
3thernitydev df64fee8be Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:42:41 +04:00
AHOVEY Saint-George a1428bb8bf Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:42:15 +04:00
3thernitydev df8a9270e8 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:42:10 +04:00
Dorian BOYER 9de83dc0cc Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:51 +04:00
Pedre Gabriel db9f9be639 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:50 +04:00
AHOVEY Saint-George 64c5f8c480 Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:50 +04:00
3thernitydev 5c017da49b Merge branch 'main' of https://github.com/Farad77/Bidule 2024-10-22 09:41:46 +04:00
Pedre Gabriel 1b71392141 piratage 2024-10-22 09:41:43 +04:00
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