Merge "Replace deprecated calls to OutputPage::parse()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 1 Nov 2018 17:20:45 +0000 (17:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 1 Nov 2018 17:20:45 +0000 (17:20 +0000)
1  2 
includes/skins/Skin.php
includes/specials/SpecialUpload.php

Simple merge
Simple merge