Merge tag '1.2.1' into develop

1.2.1
jalendport · Jun 25, 2020 · 43c240a · 43c240a
2 parents e0bd830 + 9e7171d
commit 43c240a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.2.1 - 2020-06-25
+### Fixed
+- Fixed incorrect branch names in README and composer.json
+
 ## 1.2.0 - 2020-06-25
 Transfer of ownership...
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
 	"name": "besteadfast/craft-preparse-field",
 	"description": "A fieldtype that parses Twig when an element is saved and saves the result as plain text.",
 	"type": "craft-plugin",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"keywords": [
 		"craft",
 		"cms",