Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6e7c6aed7d50714b151fff8b87cdcf0c50037aa7 https://github.com/phpmyadmin/phpmyadmin/commit/6e7c6aed7d50714b151fff8b87cd... Author: Michal Čihař <michal@cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M export.php M import.php M libraries/Util.php Log Message: ----------- Avoid breakage if set_time_limit is disabled Fixs #13468 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d15da74edaf0f9038d5356dab23866097ece0707 https://github.com/phpmyadmin/phpmyadmin/commit/d15da74edaf0f9038d5356dab238... Author: Michal Čihař <michal@cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M export.php M import.php M libraries/classes/Util.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9eb7287b72ec...d15da74edaf0