Merge "API: When undoing an edit, allow overriding content model."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 Sep 2016 03:30:31 +0000 (03:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Sep 2016 03:30:31 +0000 (03:30 +0000)

Trivial merge