Merge "Don't wait for thumbnails that take long to render"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 5 Sep 2018 19:34:05 +0000 (19:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 5 Sep 2018 19:34:05 +0000 (19:34 +0000)

Trivial merge