Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 63b9f41a073803ca01ecff62ae1d6d9ec359a863 https://github.com/phpmyadmin/phpmyadmin/commit/63b9f41a073803ca01ecff62ae1d... Author: William Desportes williamdes@wdes.fr Date: 2020-01-02 (Thu, 01 January 2020) +01:00

Changed paths: M templates/setup/home/index.twig

Log Message: ----------- Fix #15734 - Uncaught TypeError: http_build_query() in setup

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

Commit: 02d13f6128a8ba23de914f1dda475ddf6b5d4d8c https://github.com/phpmyadmin/phpmyadmin/commit/02d13f6128a8ba23de914f1dda47... Author: William Desportes williamdes@wdes.fr Date: 2020-01-02 (Thu, 01 January 2020) +01:00

Changed paths: M ChangeLog

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

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

Commit: 7c0bdfd48e5972227146743f60d08e181c57484f https://github.com/phpmyadmin/phpmyadmin/commit/7c0bdfd48e5972227146743f60d0... Author: William Desportes williamdes@wdes.fr Date: 2020-01-02 (Thu, 01 January 2020) +01:00

Changed paths: M libraries/classes/Display/Results.php

Log Message: ----------- Fix #14936 - improve the fix for #14936

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

Commit: bd8e8a856a6883db180e38581a10f1142ee5d80b https://github.com/phpmyadmin/phpmyadmin/commit/bd8e8a856a6883db180e38581a10... Author: William Desportes williamdes@wdes.fr Date: 2020-01-02 (Thu, 01 January 2020) +01:00

Changed paths: M ChangeLog M libraries/classes/Display/Results.php M templates/setup/home/index.twig

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

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