diff options
| author | Isaac Bennetch <bennetch@gmail.com> | 2019-06-03 08:34:46 -0400 |
|---|---|---|
| committer | Isaac Bennetch <bennetch@gmail.com> | 2019-06-03 08:34:46 -0400 |
| commit | 59edb273ff49ec7692e81c1a3e41398ad60cff55 (patch) | |
| tree | 3ee31d73c17b35d74d13280175d0e8d102a45f6a | |
| parent | e12ca0b3533abdb7eac4f9914d428781ae5d9def (diff) | |
| download | sql-parser-59edb273ff49ec7692e81c1a3e41398ad60cff55.zip sql-parser-59edb273ff49ec7692e81c1a3e41398ad60cff55.tar.gz sql-parser-59edb273ff49ec7692e81c1a3e41398ad60cff55.tar.bz2 | |
Fix CHANGELOG merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 407fa57..95a986f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Change Log -## [4.3.2] - 2019-06-03 +## [5.0.0] - 2019-05-09 +* Drop support for PHP 5.3, PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0 and HHVM +* Enable strict mode on PHP files * Fix redundant whitespaces in build() outputs (#228) * Fix incorrect error on DEFAULT keyword in ALTER operation (#229) * Fix incorrect outputs from Query::getClause (#233) @@ -11,10 +13,10 @@ * Fix for error message with multiple CALL statements (#223) * Recognize the question mark character as a parameter (#242) -## [5.0.0] - 2019-05-09 +## [4.3.2] - 2019-06-03 + +Backport fixes from 5.0.0 to QA branch: -* Drop support for PHP 5.3, PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0 and HHVM -* Enable strict mode on PHP files * Fix redundant whitespaces in build() outputs (#228) * Fix incorrect error on DEFAULT keyword in ALTER operation (#229) * Fix incorrect outputs from Query::getClause (#233) |