Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9edddbf5982d8923e52cac63229297d5bfa529a1 https://github.com/phpmyadmin/phpmyadmin/commit/9edddbf5982d8923e52cac632292... Author: Michal Čihař <michal@cihar.com> Date: 2015-09-14 (Mon, 14 Sep 2015) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Avoid failure if allowdeny rules are not set Fixes #11478 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ead7b50cf631c158457125112461e1ded8da4f9a https://github.com/phpmyadmin/phpmyadmin/commit/ead7b50cf631c158457125112461... Author: Michal Čihař <michal@cihar.com> Date: 2015-09-14 (Mon, 14 Sep 2015) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/53277f8b6707...ead7b50cf631