Merge "RCFilters UI: Implement conflict global result message"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 18 Mar 2017 02:01:52 +0000 (02:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 18 Mar 2017 02:01:52 +0000 (02:01 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js

Simple merge
Simple merge
Simple merge