Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1698c5db44867a73571d4bda8d6b9775a3b3f6b4
https://github.com/phpmyadmin/phpmyadmin/commit/1698c5db44867a73571d4bda8d6b9775a3b3f6b4
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M ChangeLog
M libraries/server_privileges.lib.php
Log Message:
-----------
Fix #11630 Warning: mysqli_fetch_array() expects parameter 1 to be
mysqli_result, boolean given
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 2fa2d12cb182af58e5d30cf074b19cdaf3705dec
https://github.com/phpmyadmin/phpmyadmin/commit/2fa2d12cb182af58e5d30cf074b19cdaf3705dec
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M ChangeLog
M js/functions.js
M po/sv.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Conflicts:
ChangeLog
Commit: ebf4955eb3ddcf15dee465af58249f09d637e391
https://github.com/phpmyadmin/phpmyadmin/commit/ebf4955eb3ddcf15dee465af58249f09d637e391
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M ChangeLog
M libraries/server_privileges.lib.php
Log Message:
-----------
Merge branch 'QA_4_5'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/34b17f61e583...ebf4955eb3dd_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
