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)
1  2 
includes/content/ContentHandler.php
tests/phpunit/includes/content/ContentHandlerTest.php

Simple merge