Merge "Don't remove border for floatright and floatleft"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Jan 2017 15:17:31 +0000 (15:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Jan 2017 15:17:31 +0000 (15:17 +0000)

Trivial merge