[phpMyAdmin Git] [phpmyadmin/sql-parser] b35c21: CHANGELOG entries for QA branch

[Isaac Bennetch]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/sql-parser
Commit: b35c21f82e7202d739f6349a583b11e6d32b2b64
https://github.com/phpmyadmin/sql-parser/commit/b35c21f82e7202d739f6349a583b11e6d32b2b64
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2019-06-03 (Mon, 06 June 2019) -04:00

Changed paths: 
M CHANGELOG.md

Log Message:
-----------
CHANGELOG entries for QA branch

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: e12ca0b3533abdb7eac4f9914d428781ae5d9def
https://github.com/phpmyadmin/sql-parser/commit/e12ca0b3533abdb7eac4f9914d428781ae5d9def
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2019-06-03 (Mon, 06 June 2019) -04:00

Changed paths: 
M CHANGELOG.md

Log Message:
-----------
Merge branch 'QA'

Commit: 59edb273ff49ec7692e81c1a3e41398ad60cff55
https://github.com/phpmyadmin/sql-parser/commit/59edb273ff49ec7692e81c1a3e41398ad60cff55
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2019-06-03 (Mon, 06 June 2019) -04:00

Changed paths: 
M CHANGELOG.md

Log Message:
-----------
Fix CHANGELOG merge conflicts

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>