Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c6db1f9a5073f1bb7a775c64f1fa5bd90f22dc72 https://github.com/phpmyadmin/phpmyadmin/commit/c6db1f9a5073f1bb7a775c64f1fa... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2017-08-13 (Sun, 13 Aug 2017)

Changed paths: M templates/table/structure/display_table_stats.phtml

Log Message: ----------- Optimize table link should not be visible in print page

Fix #13579

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 3c4ec46b0e0b5d8fb651f88d601b7dc09b621565 https://github.com/phpmyadmin/phpmyadmin/commit/3c4ec46b0e0b5d8fb651f88d601b... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2017-08-13 (Sun, 13 Aug 2017)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #13579

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: e82ca3582eaebb9005263202a6676bf37a15c6c1 https://github.com/phpmyadmin/phpmyadmin/commit/e82ca3582eaebb9005263202a667... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2017-08-13 (Sun, 13 Aug 2017)

Changed paths: M ChangeLog A templates/table/structure/display_table_stats.phtml M templates/table/structure/display_table_stats.twig

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

Conflicts: templates/table/structure/display_table_stats.phtml

Commit: 541525cf41b556c12f3d33c28935fe4962a4c220 https://github.com/phpmyadmin/phpmyadmin/commit/541525cf41b556c12f3d33c28935... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2017-08-13 (Sun, 13 Aug 2017)

Changed paths: R templates/table/structure/display_table_stats.phtml

Log Message: ----------- Remove unnecessarily file, added in merge

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b679fa78b406...541525cf41b5