Merge branch 'hotfix/39' into develop

Forward port #39
zendframework · Jul 11, 2017 · a23c8bf · a23c8bf
2 parents 6834301 + 6d8c8d0
commit a23c8bf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,8 +45,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#53](https://github.com/zendframework/zend-modulemanager/pull/53) preventing race conditions
-  when writing cache files (merged configuration)
+- [#39](https://github.com/zendframework/zend-modulemanager/pull/39) and
+  [#53](https://github.com/zendframework/zend-modulemanager/pull/53) prevent
+  race conditions when writing cache files (merged configuration).
 - [#36](https://github.com/zendframework/zend-modulemanager/pull/36) removes a
   throw from `ServiceListener::onLoadModulesPost()` that was previously emitted
   when a named plugin manager did not have an associated service present yet.