Merge "Remove obsolete style-only module 'mediawiki.action.history.diff'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 9 Jan 2018 19:15:47 +0000 (19:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 9 Jan 2018 19:15:47 +0000 (19:15 +0000)
1  2 
resources/Resources.php

Simple merge