dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdf4a17 6040f3a)
Merge "Make autoblocks update with the parent block"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 31 Jan 2014 18:59:09 +0000 (18:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Jan 2014 18:59:09 +0000 (18:59 +0000)
1  2 
includes/Block.php patch | diff1 | diff2 | blob | history
includes/specials/SpecialBlock.php patch | diff1 | diff2 | blob | history

diff --cc includes/Block.php
Simple merge
diff --cc includes/specials/SpecialBlock.php
Simple merge
Wiklou, le Wiki du Wiklou