Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ba570e102dd8229b79e4c5608234b2934e5fc781 https://github.com/phpmyadmin/phpmyadmin/commit/ba570e102dd8229b79e4c5608234... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M .travis.yml

Log Message: ----------- Disable xdebug for selenium tests and for apidocs

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

Commit: 823aad9ad6d7f2528a5424a0b11193858d79ef6d https://github.com/phpmyadmin/phpmyadmin/commit/823aad9ad6d7f2528a5424a0b111... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M index.php M libraries/classes/Charsets.php

Log Message: ----------- Fix #15614 - Undefined offset on index page for MySQL 5.7.8

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

Commit: efbf84bdb18b0bbf89e9fc5bbe4f52cbbd359d7e https://github.com/phpmyadmin/phpmyadmin/commit/efbf84bdb18b0bbf89e9fc5bbe4f... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M .travis.yml M libraries/classes/Charsets.php

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

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

Commit: bfe41c0434d0ac5aa348f1fd6bf787a51a413065 https://github.com/phpmyadmin/phpmyadmin/commit/bfe41c0434d0ac5aa348f1fd6bf7... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M ChangeLog

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

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

Commit: 0a783a464131ced2a3a48dbf8d0ffb8c4dd5d380 https://github.com/phpmyadmin/phpmyadmin/commit/0a783a464131ced2a3a48dbf8d0f... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M ChangeLog

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

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

Commit: e840af7fffdc6943c1dea4107c13f3fe42ae3056 https://github.com/phpmyadmin/phpmyadmin/commit/e840af7fffdc6943c1dea4107c13... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M .travis.yml M ChangeLog M libraries/classes/Charsets.php

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

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