dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7c7cfb c873333)
Merge "Defer cookie block checks to resolve a circular dependency"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 1 Jul 2019 11:09:45 +0000 (11:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 1 Jul 2019 11:09:45 +0000 (11:09 +0000)
1  2 
includes/block/BlockManager.php patch | diff1 | diff2 | blob | history
includes/user/User.php patch | diff1 | diff2 | blob | history

diff --cc includes/block/BlockManager.php
Simple merge
diff --cc includes/user/User.php
Simple merge
Wiklou, le Wiki du Wiklou