Add changelog for 1.0.4

Alias dev-master as 1.0
silverstripe · Feb 4, 2016 · dd1c64e · dd1c64e
1 parent 2adb65e
commit dd1c64e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.0.4]
+
+* Changelog added
+* Converted to PSR-2
+* Updated to supported module standard
+* Alias dev-master as 1.0
diff --git a/composer.json b/composer.json
@@ -6,5 +6,10 @@
 	"license": "BSD-3-Clause",
 	"require": {
 		"silverstripe/framework": "3.*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }