Merge pull request #14 from scott1702/master

Add changelog
silverstripe · Nov 19, 2015 · 13ef100 · 13ef100
2 parents 15df158 + e622dc5
commit 13ef100
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,13 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.0.3]
+
+* Changelog added.
+* Include tests for PHP 5.6 and 3.2
+* Added CWP keyword
+* Move to new travis containerised infrastructure
+* Updating travis provisioner
diff --git a/composer.json b/composer.json
@@ -18,5 +18,12 @@
 	},
 	"support": {
 		"issues": "https://github.com/silverstripe-labs/silverstripe-selectupload/issues"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }