Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d0233a047a601eb4b8d8bf80055ceff6bb9a71a1 https://github.com/phpmyadmin/phpmyadmin/commit/d0233a047a601eb4b8d8bf80055c... Author: Jack Cherng jfcherng@gmail.com Date: 2018-08-06 (Mon, 08 August 2018) -03:00

Changed paths: M ChangeLog M libraries/classes/Config/FormDisplay.php

Log Message: ----------- Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"

Signed-off-by: Jack Cherng jfcherng@gmail.com (cherry picked from commit 9a7a1e35b0aea13d6ac46007d8600e7575ac6093) Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: 0294bcc5f2af6c7c978d69d53ff55443be2881f9 https://github.com/phpmyadmin/phpmyadmin/commit/0294bcc5f2af6c7c978d69d53ff5... Author: Isaac Bennetch bennetch@gmail.com Date: 2018-08-07 (Tue, 08 August 2018) -04:00

Changed paths: M ChangeLog M libraries/classes/Rte/Footer.php

Log Message: ----------- Fix #14554 Icon missing for creating a new routine, trigger, and event

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: af98a94b3430b7c90c84f2e0f83ed3c13706532a https://github.com/phpmyadmin/phpmyadmin/commit/af98a94b3430b7c90c84f2e0f83e... Author: Isaac Bennetch bennetch@gmail.com Date: 2018-08-07 (Tue, 08 August 2018) -04:00

Changed paths: M ChangeLog

Log Message: ----------- Fix merge conflicts from QA_4_8

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 1d39152af2a34758dcd17090215c96ae281e5542 https://github.com/phpmyadmin/phpmyadmin/commit/1d39152af2a34758dcd17090215c... Author: Isaac Bennetch bennetch@gmail.com Date: 2018-08-07 (Tue, 08 August 2018) -04:00

Changed paths: M ChangeLog M libraries/classes/Rte/Footer.php

Log Message: ----------- Merge branch 'QA_4_8'