bring the branch up to date with the master branch

cherylli · cherylli · commit 89041ff1bb9d · 2022-06-11T13:53:38.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - pages (basic structure): homepage, blog, about-us, contact-us, 404
 - subscription functionality with MailChimp integration
 
-## Unreleased
+## 1.1.0
 
 ### Added
 
@@ -42,7 +42,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
-## Added
+### Added
 
 - About page content (first section)
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-dev-path",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "dev": "yarn run open-browser-win && next dev -p 3010",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "web-dev-path",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "yarn run open-browser-win && next dev -p 3010",`