[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Define a merge strategy for JsonConfigs

2016-10-13 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. Change subject: Define a merge strategy for JsonConfigs .. Define a merge strategy for JsonConfigs Change-Id: Iafe00d370a5a78c469cf98ae0b2628239da025dd --- M extension.js

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Define a merge strategy for JsonConfigs

2016-10-13 Thread Reedy (Code Review)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/315772 Change subject: Define a merge strategy for JsonConfigs .. Define a merge strategy for JsonConfigs Change-Id: Iafe00d370a5a78c469cf98ae0b262823