Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 045046a1dc69b01da15d43aa7dff995269103113 https://github.com/phpmyadmin/phpmyadmin/commit/045046a1dc69b01da15d43aa7dff... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M export.php Log Message: ----------- Document task to do Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 1a558a4190fe78ff283a5f5cfabcc773ef15c738 https://github.com/phpmyadmin/phpmyadmin/commit/1a558a4190fe78ff283a5f5cfabc... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M setup/frames/servers.inc.php Log Message: ----------- Ensure id is numeric Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ef6b9e812057689056db29fc4fe218e58c3a6551 https://github.com/phpmyadmin/phpmyadmin/commit/ef6b9e812057689056db29fc4fe2... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M setup/frames/servers.inc.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 6897a5df538ce5690ee637bc27e450fb514a52c9 https://github.com/phpmyadmin/phpmyadmin/commit/6897a5df538ce5690ee637bc27e4... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M view_operations.php Log Message: ----------- Fix messages handling The first two messages were not used at all, now we concatenate them all. Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bdfaaa4f40e1...6897a5df538c