Merge "resourceloader: Implement 'deprecated' option for FileModule"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Aug 2016 18:48:39 +0000 (18:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Aug 2016 18:48:39 +0000 (18:48 +0000)

Trivial merge