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

Changed paths: M templates/table/relation/internal_relational_row.phtml

Log Message: ----------- Add missing parameter (issue #12941)

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

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

Changed paths: M templates/table/relation/internal_relational_row.phtml

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/018fa7515608...0455817f298e