Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 463321a6d584780d57572813e7ed20c080648efc https://github.com/phpmyadmin/phpmyadmin/commit/463321a6d584780d57572813e7ed... Author: Lakshay arora b16060@students.iitmandi.ac.in Date: 2018-02-10 (Sat, 10 Feb 2018)

Changed paths: M libraries/common.inc.php

Log Message: ----------- Fix for issue #13969 Changed file ./libraries/common.inc.php Removed member header from line '$response->getHeader()->header->getScripts()', there is no such member. Signed-Off-By: Lakshay arora (b16060@students.iitmandi.ac.in)

Commit: 767f0731e9e76c5dfbd5c728b4da24f7f88b74db https://github.com/phpmyadmin/phpmyadmin/commit/767f0731e9e76c5dfbd5c728b4da... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-02-16 (Fri, 16 Feb 2018)

Changed paths: M libraries/common.inc.php

Log Message: ----------- Merge pull request #13983 from nulll-pointer/contribution

Fix for broken profiling; issue #13969 Fix #13969

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e2d0928bad05...767f0731e9e7