Merge "resourceloader: Use Date.now() for mw.now() instead of '+new Date'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Apr 2017 21:08:44 +0000 (21:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Apr 2017 21:08:45 +0000 (21:08 +0000)

Trivial merge