Merge branch '3.x'

Conflicts:
	CHANGELOG.md
This commit is contained in:
Nikita Popov 2018-01-25 22:32:25 +01:00
commit c2d3ecad35

View File

@ -100,9 +100,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.4-dev
Version 3.1.5-dev
-----------------
Nothing yet.
Version 3.1.4 (2018-01-25)
--------------------------
### Fixed
* Fixed pretty printing of `-(-$x)` and `+(+$x)`. (#459)