Merge pull request #2146 from woouki/master
authorAlexander Ebert <ebert@woltlab.com>
Mon, 5 Dec 2016 10:39:51 +0000 (11:39 +0100)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2016 10:39:51 +0000 (11:39 +0100)
Fix travis error in ViewableMedia class


Trivial merge