From edeb42259b8fbf66923e051c698f20f6db6b282b Mon Sep 17 00:00:00 2001
From: scott1702 <scott@silverstripe.com>
Date: Wed, 18 Nov 2015 15:20:01 +1300
Subject: [PATCH] Add changelog for release

---
 changelog.md  | 10 ++++++++++
 composer.json |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 changelog.md

diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..d556643
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c585541..fe7c546 100644
--- a/composer.json
+++ b/composer.json
@@ -16,5 +16,12 @@
 	"require":
 	{
 		"silverstripe/framework": "3.*"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }