Merge branch 'hotfix/changelog' into develop

Fixes 3.1.1 CHANGELOG Conflicts: CHANGELOG.md
laminas · Jul 10, 2018 · 64adea0 · 64adea0
2 parents 20d2bd3 + ce4366c
commit 64adea0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,9 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#34](https://github.com/zendframework/zend-math/pull/34) fixes the docblock for `Rand::getFloat` to indicate that the bottom boundary
-  can include 0.
-
 ## 3.1.1 - 2018-07-10
 
 ### Added
@@ -45,6 +42,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#34](https://github.com/zendframework/zend-math/pull/34) fixes the docblock for `Rand::getFloat` to indicate that the bottom boundary
+  can include 0.
+
 - [#36](https://github.com/zendframework/zend-math/pull/36) removes all references to ircmaxell/random-lib from the component. While
   it was no longer used internally, references still existed that caused confusion for
   some users.