Merge branch '3.x'

Conflicts: CHANGELOG.md
nikic · Nov 4, 2017 · 361398b · 361398b
2 parents fd6e8d7 + 08131e7
commit 361398b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,9 +69,14 @@ Version 4.0.0-alpha1 (2017-10-18)
 * The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`.
   However, this is an internal class and should not be used directly.
 
-Version 3.1.2-dev
+Version 3.1.3-dev
 -----------------
 
+Nothing yet.
+
+Version 3.1.2 (2017-11-04)
+--------------------------
+
 ### Fixed
 
 * Comments on empty blocks are now preserved on a `Stmt\Nop` node. (#382)