Merge branch 'hotfix/221' into develop

Forward port #221
zendframework · Dec 9, 2015 · 332462c · 332462c
2 parents fd3eff5 + 01db180
commit 332462c
Show file tree

Hide file tree

Showing 10 changed files with 645 additions and 641 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ Fourth release candidate.
 - [#223](https://github.com/zendframework/zend-expressive/pull/223) updates the
   documentation to refer to the `composer serve` command where relevant, and
   also details how to create the command for standalone users.
+- [#221](https://github.com/zendframework/zend-expressive/pull/221) splits the
+  various cookbook entries into separate files, so each is self-contained.
 
 ## 1.0.0rc3 - 2015-12-07