Merge "Remove the localStorage replication of the block cookie"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 20 Mar 2017 23:16:31 +0000 (23:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 20 Mar 2017 23:16:32 +0000 (23:16 +0000)
1  2 
resources/Resources.php

Simple merge