Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d1e353f23539e12545ee77314df7ccdf4a7ec2e5 https://github.com/phpmyadmin/phpmyadmin/commit/d1e353f23539e12545ee77314df7... Author: Pavel Rochnyack <pavel2000@ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Fix #12419 wrong description on GRANT option of table/routine privileges. Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru> Commit: 26c7a585332f505220c7e7e0c720ae016aafe29e https://github.com/phpmyadmin/phpmyadmin/commit/26c7a585332f505220c7e7e0c720... Author: Deven Bansod <devenbansod@users.noreply.github.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 Fix #12419 wrong description on GRANT option of table/routine privileges Commit: f14ad58d69c8b164c4f94ad6143f57604ea063cd https://github.com/phpmyadmin/phpmyadmin/commit/f14ad58d69c8b164c4f94ad6143f... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 46ae5005080202d10865720e020aa23f4c4ae597 https://github.com/phpmyadmin/phpmyadmin/commit/46ae5005080202d10865720e020a... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12419 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: f04aa22cc67320530124ba92b7b9c61f273a990e https://github.com/phpmyadmin/phpmyadmin/commit/f04aa22cc67320530124ba92b7b9... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fc5bb4a27870...f04aa22cc673