Merge "Ignore defineProperty() failures in mw.log.deprecate"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Oct 2016 17:04:59 +0000 (17:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Oct 2016 17:04:59 +0000 (17:04 +0000)
1  2 
resources/src/mediawiki/mediawiki.js

Simple merge