Merge pull request #24 from scott1702/master

Add changelog
silverstripe · Nov 19, 2015 · a754299 · a754299
2 parents 5b82868 + edeb422
commit a754299
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,10 @@
+# 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.
+* Include 3.2 and php 5.6 in tests
diff --git a/composer.json b/composer.json
@@ -16,5 +16,12 @@
 	"require":
 	{
 		"silverstripe/framework": "3.*"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }