Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 40edb83b3cdc1d018bda9215fad7009362c456d7 https://github.com/phpmyadmin/phpmyadmin/commit/40edb83b3cdc1d018bda9215fad7... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M tbl_replace.php Log Message: ----------- Correctly store and report file upload errors Fixes #11946 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 5636189d56e9cdd3e67f5a389a98230d09a27140 https://github.com/phpmyadmin/phpmyadmin/commit/5636189d56e9cdd3e67f5a389a98... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M tbl_replace.php Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: bee427991b1be33f349fd34e854eed077b2ed518 https://github.com/phpmyadmin/phpmyadmin/commit/bee427991b1be33f349fd34e854e... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M tbl_replace.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8d5e94d1bdcc...bee427991b1b