Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 81825ebda9f0066a272b89baf67f78266f01c00b https://github.com/phpmyadmin/phpmyadmin/commit/81825ebda9f0066a272b89baf67f... Author: William Desportes williamdes@wdes.fr Date: 2019-12-09 (Mon, 12 December 2019) +01:00

Changed paths: M db_designer.php

Log Message: ----------- Fix #15633 - designer set display field broken for php 5.x versions

Fixes: #15633 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 3fe68cee4e21aed886dea94bead24863c6d7443e https://github.com/phpmyadmin/phpmyadmin/commit/3fe68cee4e21aed886dea94bead2... Author: William Desportes williamdes@wdes.fr Date: 2019-12-09 (Mon, 12 December 2019) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15633

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: edc53d2c6e5851ccffb82baf3a7a464b1e09ce42 https://github.com/phpmyadmin/phpmyadmin/commit/edc53d2c6e5851ccffb82baf3a7a... Author: William Desportes williamdes@wdes.fr Date: 2019-12-09 (Mon, 12 December 2019) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0

[ci skip]

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 070348a5e1b52281189433a919120e5cdb5da7ec https://github.com/phpmyadmin/phpmyadmin/commit/070348a5e1b52281189433a91912... Author: William Desportes williamdes@wdes.fr Date: 2019-12-09 (Mon, 12 December 2019) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_5_0'

[ci skip]

Signed-off-by: William Desportes williamdes@wdes.fr