Merge "Provide a way to restore an old revision with multiple slots."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 24 Sep 2018 19:36:32 +0000 (19:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 24 Sep 2018 19:36:32 +0000 (19:36 +0000)
1  2 
autoload.php
includes/DefaultSettings.php

diff --cc autoload.php
Simple merge
Simple merge