Merge "build: Updating mediawiki/mediawiki-codesniffer to 13.0.0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 30 Sep 2017 23:44:57 +0000 (23:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 30 Sep 2017 23:44:57 +0000 (23:44 +0000)
1  2 
composer.json
includes/installer/MysqlUpdater.php
includes/libs/rdbms/database/Database.php

diff --cc composer.json
Simple merge
Simple merge