Add changelog for 1.2.0

silverstripe · Feb 4, 2016 · b084f54 · b084f54
1 parent 2681774
commit b084f54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0]
+
+* Fix broken badges
+* Converted to PSR-2
+* Use Config API
+* Optionally log check failures
+* Update documentation and configuration to supported module standard
+
 ## [1.1.2]
 
 * Bring up to supported module standard.

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.1.x-dev"
+			"dev-master": "1.2.x-dev"
 		}
 	},
 	"license": "BSD-3-Clause"