chore: merge master into develop (#48)

dequelabs · Jun 21, 2024 · 8c3b9fe · 8c3b9fe
2 parents 0453a2a + 76011e7
commit 8c3b9fe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.1](https://github.com/dequelabs/action-sync-branches/compare/v1.0.0...v1.0.1) (2020-11-10)
+
+### Bug Fixes
+
+- don't throw an error when a pr template is not found ([#11](https://github.com/dequelabs/action-sync-branches/issues/11)) ([7e8cdfa](https://github.com/dequelabs/action-sync-branches/commit/7e8cdfac15a2236e2ef38123abfb03f67eb9c9d0))
+- tag major releases on commits to master ([#18](https://github.com/dequelabs/action-sync-branches/issues/18)) ([57788bb](https://github.com/dequelabs/action-sync-branches/commit/57788bbeea9a0c35d1f31df38136620204ec02cd))
+
 ## 1.0.0 (2020-01-07)
 
 ### Features

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "action-sync-branches",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Creates a sync pull request between two branches",
   "private": true,
   "main": "lib/main.js",