Merge branch 'master' into branche_6

commit 2 direct dans master
commit 1 dans branche_6
2021-01-15 12:05:06 +01:00 · 2021-01-15 11:49:56 +01:00 · 2021-01-15 11:45:52 +01:00 · 2021-01-08 20:17:10 +01:00 · 2021-01-08 20:16:25 +01:00 · 2021-01-08 20:14:02 +01:00
3 changed files with 5 additions and 0 deletions
@@ -1,3 +1,4 @@
 Je rajoute quelque chose. Je suis toujours dans ma branche 1.
 Je rajoute encore quelque chose et je suis toujours dans la branche 1.
 Ajout branche 6
@@ -2,3 +2,5 @@ bla bla bla
 bli bli bli
 Blo blo blo
 Blu blu blu
 Ble ble ble
 Ajout direct dans master
@@ -1 +1,3 @@
 Ta ta ta
 Tu tu tu
 To to to
Author	SHA1	Message	Date
Bertrand	9ae0a6d519	Merge branch 'master' into branche_6	2021-01-15 12:05:06 +01:00
Bertrand	be65e85cb3	commit 2 direct dans master	2021-01-15 11:49:56 +01:00
Bertrand	01f6d01835	commit 1 dans branche_6	2021-01-15 11:45:52 +01:00
Bertrand	b2f0dd2113	commit 2 branche_5	2021-01-08 20:17:10 +01:00
Bertrand	3bbbf08b7f	commit branche_5	2021-01-08 20:16:25 +01:00
Bertrand	a763d99dcd	Merge pull request 'PR branche_4' (#6 ) from branche_4 into master Reviewed-on: #6	2021-01-08 20:14:02 +01:00