Merge "User::isPingLimitable(): handle CIDR notation in $wgRateLimitsExcludedIPs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
commit698fa7d8beff267c56292b476b3fe434165cc273
treecf49d253a66ac93c40a97b95cbdc00ec67d41fb1
parent63c1c841d88f4dc572ceded8b48bd44937713ec6
parentc2f357f1bf993709783c19154e06448c2dc8dd0f
Merge "User::isPingLimitable(): handle CIDR notation in $wgRateLimitsExcludedIPs"
includes/DefaultSettings.php
tests/phpunit/includes/user/UserTest.php