Merge "Rename mediawiki.action.history.diff to mediawiki.diff.styles"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 6 Sep 2016 15:56:17 +0000 (15:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 6 Sep 2016 15:56:17 +0000 (15:56 +0000)
1  2 
includes/diff/DifferenceEngine.php
resources/Resources.php

Simple merge
Simple merge