Merge pull request #395 from scott1702/master

Add changelog for release
silverstripe · Nov 19, 2015 · f180a1e · f180a1e
2 parents 9f26605 + b964cfb
commit f180a1e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [3.0.0]
 
-Changelog added.
+* Changelog added.
 
 ## [3.0.1]
 
@@ -19,3 +19,17 @@ Changelog added.
 ## [3.0.2]
 
  * Fix Casting to integer to prevent potential SQL injection.
+
+## [3.1.0]
+
+* Add 3.0.3 changelog
+* Update translations
+* BUG Prevent subsequent write being triggered in onAfterWrite()
+* MINOR: Fix for styling of step navigation
+* MINOR: New email object for each recipient
+* removed isCheckboxGroup check and replace
+* Remove '[' and ']' from jQuery selector for checkbox groups
+* ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects
+* adding some spaces for better readability
+* Making requirements clearer
+* Add 3.0.2 changelog
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.0.x-dev"
+			"dev-master": "3.1.x-dev"
 		}
 	}
 }