Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 681e9089912ee168a92ce6644a1f5e7790497a19 https://github.com/phpmyadmin/phpmyadmin/commit/681e9089912ee168a92ce6644a1f... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix check for user groups freatures being enabled Fixes #12868 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 6dbd4233c8daef363912b540acc5d783f5f2dd8a https://github.com/phpmyadmin/phpmyadmin/commit/6dbd4233c8daef363912b540acc5... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/811c73bbab25...6dbd4233c8da