Merge pull request #40 from tractorcow/pulls/release-300

Changelog for 3.0.0 release

changelog.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.0]
+
+- Replace review page form with inline form
+- Update translations
+- Convert to psr-2
+- Change "mark as reviewed" page action panel styles
+- Add report filter for only the pages a user is assigned to
+- BUG Show inherited date even when inheriting settings
+- API CMS Editable notification templates
+
 ## [2.1.0]
 
 - Added translations
@@ -12,4 +22,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.0.0]
 
-Changelog added.
+Changelog added.

composer.json

@@ -22,5 +22,10 @@
 	},
     "suggests": {
         "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
-    }
+    },
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.0.x-dev"
+		}
+	}
 }