Finish 2.6.0

brandonkelly · brandonkelly · commit 33da444d4995 · 2019-08-01T15:45:15.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release Notes for Element API
 
-## Unreleased
+## 2.6.0 - 2019-08-01
 
 ### Added
 - Added the `callback` endpoint config setting, which enables JSONP output. ([#96](https://github.com/craftcms/element-api/issues/96))
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/element-api",
   "description": "Create a JSON API for your elements in Craft",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "type": "craft-plugin",
   "keywords": [
     "api",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "craftcms/element-api",`
`3`	`3`	`"description": "Create a JSON API for your elements in Craft",`
`4`		`- "version": "2.5.4",`
	`4`	`+ "version": "2.6.0",`
`5`	`5`	`"type": "craft-plugin",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"api",`