Merge "MCR: replace slot_inherited with slot_origin"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Mar 2018 12:06:32 +0000 (12:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Mar 2018 12:06:32 +0000 (12:06 +0000)
1  2 
includes/Storage/RevisionStore.php
includes/installer/MssqlUpdater.php
includes/installer/MysqlUpdater.php
includes/installer/SqliteUpdater.php
maintenance/mssql/tables.sql
maintenance/tables.sql

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge