Merge branch 'master' into motranslator

phpmyadmin · Jan 6, 2017 · 91e4709 · 91e4709
2 parents b6e999a + 1fae088
commit 91e4709
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ vendor/
 composer.lock
 coverage.xml
 *~
+.php_cs.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Fix parsing of FIELDS and LINES options in SELECT..INTO
 * PHP 7.2 compatibility.
 * Better parameter passing to query formatter.
+* Coding style fixes.
 
 ## [3.4.14] - 2016-11-30