Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 609cd722e91c921d3b478013e1aaf5586c7c6fa0 https://github.com/phpmyadmin/phpmyadmin/commit/609cd722e91c921d3b478013e1aa... Author: William Desportes williamdes@wdes.fr Date: 2019-12-31 (Tue, 12 December 2019) +01:00

Changed paths: M libraries/classes/Util.php

Log Message: ----------- Fix #15725 - error 500 when exporting - set time limit

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

Commit: 4a5294932e4d5ac893bab3a37a5f797573f03328 https://github.com/phpmyadmin/phpmyadmin/commit/4a5294932e4d5ac893bab3a37a5f... Author: William Desportes williamdes@wdes.fr Date: 2019-12-31 (Tue, 12 December 2019) +01:00

Changed paths: M ChangeLog

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

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

Commit: cd7504b2a23a7543baee8981dd1c5a0efbacc28f https://github.com/phpmyadmin/phpmyadmin/commit/cd7504b2a23a7543baee8981dd1c... Author: William Desportes williamdes@wdes.fr Date: 2019-12-31 (Tue, 12 December 2019) +01:00

Changed paths: M ChangeLog M libraries/classes/Util.php

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

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