Merge branch 'release-1.1.0' into develop

Bump version to 1.1.0
Merge branch 'myfeature1' into develop
2023-06-30 13:16:56 +02:00 · 2023-06-30 13:15:56 +02:00 · 2023-06-30 13:15:25 +02:00 · 2023-06-30 13:15:23 +02:00 · 2023-06-30 13:15:09 +02:00 · 2023-06-30 13:14:28 +02:00
3 changed files with 10 additions and 3 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# sw4m-gitflow 1.0.0
+# sw4m-gitflow 1.1.0
-Hello world! This is SW4M!
+Hello world! Minor fix!
 ## Critical bugfix
--- a/myfeature1.md
+++ b/myfeature1.md
@@ -0,0 +1,7 @@
 # myfeature1
 Feature for future release!
 Some content, I guess.
 This is done now, too!
--- a/myfeature2.md
+++ b/myfeature2.md
@@ -4,4 +4,4 @@ Major feature for next release!
 One more commit then this feature is done!
-Okay, now we are done!
+No we are really done here.
Author	SHA1	Message	Date
marvinscham	da91263a60	Merge branch 'release-1.1.0' into develop	2023-06-30 13:16:56 +02:00
marvinscham	567490384a	Bump version to 1.1.0	2023-06-30 13:15:56 +02:00
marvinscham	3fd3689c11	Merge branch 'myfeature1' into develop	2023-06-30 13:15:25 +02:00
marvinscham	702406145f	Merge branch 'myfeature2' into develop	2023-06-30 13:15:23 +02:00
marvinscham	d86e3dd340	Final changes	2023-06-30 13:15:09 +02:00
marvinscham	8ee2658b6d	Final change	2023-06-30 13:14:28 +02:00
marvinscham	09b4c9af6f	Changed comment	2023-06-30 13:11:26 +02:00
marvinscham	dbf0d20a42	Merge branch 'develop' into myfeature2	2023-06-30 13:10:53 +02:00
marvinscham	cada1fcded	Further changes	2023-06-30 13:10:02 +02:00
marvinscham	0bdbd02e01	Merge branch 'release-1.0.0' into develop	2023-06-29 19:20:23 +02:00
marvinscham	ff0c1caa30	Init myfeature1	2023-06-29 16:58:00 +02:00
`@@ -4,4 +4,4 @@ Major feature for next release!`

	`One more commit then this feature is done!`	`One more commit then this feature is done!`

	`Okay, now we are done!`	`No we are really done here.`