[phpmyadmin/phpmyadmin] 0ce416: Fix error in PR 11560

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0ce416b14c5e09be34e0140fe3425d20fed0398d https://github.com/phpmyadmin/phpmyadmin/commit/0ce416b14c5e09be34e0140fe342... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix error in PR 11560 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: f6ba32e7958bf53f136640cbdb2e942963c31c63 https://github.com/phpmyadmin/phpmyadmin/commit/f6ba32e7958bf53f136640cbdb2e... Author: Marc Delisle <marc@infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #11566 from devenbansod/fix_error_in_11560 Fix error in PR #11560 Commit: 369be59c08a085fa8490fbbeb471860993a6d7e4 https://github.com/phpmyadmin/phpmyadmin/commit/369be59c08a085fa8490fbbeb471... Author: Martin Lacina <martin@whistler.sk> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.4% (2680 of 3210 strings) [CI skip] Commit: 835c63aed27b1bf5002b9aa60dbee50be78a58e1 https://github.com/phpmyadmin/phpmyadmin/commit/835c63aed27b1bf5002b9aa60dbe... Author: Weblate <noreply@weblate.org> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: da064eec2722b187a101f880c602ebd1bb870038 https://github.com/phpmyadmin/phpmyadmin/commit/da064eec2722b187a101f880c602... Author: Marc Delisle <marc@infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge commit 'f6ba32e' Commit: 7239f7946cd5ead1c57caa26d0809b3354e77d1d https://github.com/phpmyadmin/phpmyadmin/commit/7239f7946cd5ead1c57caa26d080... Author: Marc Delisle <marc@infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fd6ed157a912...7239f7946cd5
participants (1)
-
Marc Delisle