Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a3410ca86a04a4aa434caf0dfcbcd157cf945b0 https://github.com/phpmyadmin/phpmyadmin/commit/5a3410ca86a04a4aa434caf0dfcb... Author: Michal Čihař michal@cihar.com Date: 2017-02-02 (Thu, 02 Feb 2017)

Changed paths: M ChangeLog M templates/table/relation/foreign_key_row.phtml

Log Message: ----------- Fixed sorting of tables in relation view

Fixes #12941

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 7c8ae87cd0a0bb85d899372c9c12d240bcd25177 https://github.com/phpmyadmin/phpmyadmin/commit/7c8ae87cd0a0bb85d899372c9c12... Author: Michal Čihař michal@cihar.com Date: 2017-02-02 (Thu, 02 Feb 2017)

Changed paths: M ChangeLog M templates/table/relation/foreign_key_row.phtml

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a67c15388430...7c8ae87cd0a0