Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fb7d734016c90f49299ce9724f486058b81cdad https://github.com/phpmyadmin/phpmyadmin/commit/4fb7d734016c90f49299ce9724f4... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Don't assume justBrowsing if there is a Join in the query

Fix #12189

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

Commit: b2d337814a5f99fda19d0bea392a40c0f1b8e154 https://github.com/phpmyadmin/phpmyadmin/commit/b2d337814a5f99fda19d0bea392a... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M po/id.po M po/mk.po

Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ada82985082c...b2d337814a5f