Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed5a8307c7629e04bff0b89595cd98228e2e7d87 https://github.com/phpmyadmin/phpmyadmin/commit/ed5a8307c7629e04bff0b89595cd... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/table/search/input_box.phtml Log Message: ----------- Fix wrong merge Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 85972d35293e6458d00d09fe5bea7448448f4c17 https://github.com/phpmyadmin/phpmyadmin/commit/85972d35293e6458d00d09fe5bea... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/table/search/input_box.phtml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4e5b08e26cc2...85972d35293e