Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f2d4700e35eb363ade8bbe47d958f9f190029bb6 https://github.com/phpmyadmin/phpmyadmin/commit/f2d4700e35eb363ade8bbe47d958... Author: William Desportes williamdes@wdes.fr Date: 2020-02-14 (Fri, 02 February 2020) +01:00

Changed paths: M .travis.yml

Log Message: ----------- Fix Windows CI by changing mariadb server version back to 10.4

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

Commit: dce1104b88597683ae5e47ee7c75ce7fb647e6e4 https://github.com/phpmyadmin/phpmyadmin/commit/dce1104b88597683ae5e47ee7c75... Author: William Desportes williamdes@wdes.fr Date: 2020-02-14 (Fri, 02 February 2020) +01:00

Changed paths: M libraries/classes/Advisor.php

Log Message: ----------- Fix use false instead of null for preg_split

Ref: 01cd7dc33b0308e42e8571bb4cc0bab557ffeace

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

Commit: b7c5cc879bf6b8e64f9a1d8196230ae8452e47b6 https://github.com/phpmyadmin/phpmyadmin/commit/b7c5cc879bf6b8e64f9a1d819623... Author: William Desportes williamdes@wdes.fr Date: 2020-02-14 (Fri, 02 February 2020) +01:00

Changed paths: M .travis.yml

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

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