Add changelog for 1.2.0

silverstripe · Nov 24, 2015 · b4024c9 · b4024c9
1 parent 1876b78
commit b4024c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0]
+
+* API Add option to specify http / https on subsite domains
+
 ## [1.1.0]
 
 * Changelog added.

diff --git a/composer.json b/composer.json
@@ -16,10 +16,5 @@
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "1.1.x-dev"
-		}
-	}
+    }
 }