Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 413f66f4c2fff81ee58bd375c9e970a56e9c4a96 https://github.com/phpmyadmin/phpmyadmin/commit/413f66f4c2fff81ee58bd375c9e9... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M ChangeLog M js/sql.js Log Message: ----------- Fix #12125 Cannot highlight a column if I scroll down from the top of the table Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 6d7acf969a1ef98f37701be1935fb015b1bb39ba https://github.com/phpmyadmin/phpmyadmin/commit/6d7acf969a1ef98f37701be1935f... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php M po/pt_BR.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Conflicts: ChangeLog Commit: 476d9a5746a89c4128c84864ca5dbfa66950cef2 https://github.com/phpmyadmin/phpmyadmin/commit/476d9a5746a89c4128c84864ca5d... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M ChangeLog M js/sql.js Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/49b3dbb83783...476d9a5746a8