Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ff743830ff439664d0db33ea3ca0552caed7b32b https://github.com/phpmyadmin/phpmyadmin/commit/ff743830ff439664d0db33ea3ca… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php Log Message: ----------- Fix #12073 Hide edit and delete buttons when the results are not related to a table Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: e04585df5b5fb4afe92ca62cf25f5fcd477083d6 https://github.com/phpmyadmin/phpmyadmin/commit/e04585df5b5fb4afe92ca62cf25… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Utils/BufferedQuery.php Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Conflicts: ChangeLog Commit: 84deb574d3ac5d40bc4b37dc2597a00c518164ba https://github.com/phpmyadmin/phpmyadmin/commit/84deb574d3ac5d40bc4b37dc259… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/07e4ab1fc31b...84deb574d3ac