Merge "HTMLForm: Show more options when incorrect displayFormat is set"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 26 Jul 2017 18:54:03 +0000 (18:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 26 Jul 2017 18:54:03 +0000 (18:54 +0000)

Trivial merge