Merge remote-tracking branch 'origin/3.x'

sonata-project · Nov 24, 2019 · bc0fb97 · bc0fb97
2 parents a52e433 + e169c14
commit bc0fb97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.18.2](https://github.com/sonata-project/SonataBlockBundle/compare/3.18.1...3.18.2) - 2019-11-24
+### Fixed
+- Make cache optional again
+
 ## [3.18.1](https://github.com/sonata-project/SonataBlockBundle/compare/3.18.0...3.18.1) - 2019-09-19
 ### Changed
 - Replaced deprecated EngineInterface

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -683,7 +683,7 @@ Before releasing anything, it is best to reduce the gap between branches:
 
 Before abandoning it, the legacy branch MUST receive a last patch version.
 Likewise, the stable branch MUST receive a last version if that version is minor,
-it SHOULD receive one is that version is a patch version.
+it SHOULD receive one if that version is a patch version.
 
 #### Creating the new stable branch and files