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 10 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

@@ -0,0 +1,6 @@
+bla bla bla
+bli bli bli
+Blo blo blo
+Blu blu blu
+Ble ble ble
+Ajout direct dans master
@@ -0,0 +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
Bertrand	9efe0cb1e1	commit 2 branche_4	2021-01-08 20:13:07 +01:00
Bertrand	e61499a900	commit branche_4	2021-01-08 20:11:52 +01:00
Bertrand	965f29d54a	Merge pull request 'PR : Ajout de bliblibli' (#5 ) from branche_3 into master Reviewed-on: #5	2021-01-08 20:05:47 +01:00
Bertrand	104a99dae8	commit dans branche 3	2021-01-08 20:04:02 +01:00
Bertrand	dc9731a55b	commit message dans la branche_2	2021-01-08 20:01:05 +01:00
Bertrand	feabb0b9e1	Merge pull request 'nouveau complément de nouveau-fichier.txt' (#3 ) from branche_1 into master Reviewed-on: #3	2020-12-07 12:44:38 +01:00
Bertrand	eba4e4e620	Merge pull request 'Pull Request de la branche 1 !' (#2 ) from branche_1 into master Reviewed-on: #2	2020-12-07 12:39:13 +01:00