Merge "Add new param of hook UserIsBlockedGlobally to docs/hooks.txt"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 13 Jun 2016 16:16:10 +0000 (16:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Jun 2016 16:16:10 +0000 (16:16 +0000)
1  2 
docs/hooks.txt

diff --cc docs/hooks.txt
Simple merge