Merge "content: Recognise .json as JsonContent in User and MediaWiki namespace"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Jun 2015 16:25:09 +0000 (16:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Jun 2015 16:25:09 +0000 (16:25 +0000)
commit4e90d55fdc9d31d93e24cf05687eb7d180806f44
tree1f54cf438e22749f3e79a24b679146a453b69a31
parentce5a0c5cd2ed4ef80b3bbbf3e91dcfe45ee7955c
parent3b44da3261673c8a23dc507d47d596ad73b8be74
Merge "content: Recognise .json as JsonContent in User and MediaWiki namespace"
includes/content/ContentHandler.php
tests/phpunit/includes/content/ContentHandlerTest.php