dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "RCFilters UI: Implement conflict global result message"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
860d4fb
..
392cdb3
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-1805,6
+1805,7
@@
return [
'rcfilters-highlightbutton-title',
'rcfilters-highlightmenu-title',
'rcfilters-highlightmenu-help',
+ 'rcfilters-noresults-conflict',
'rcfilters-state-message-subset',
'rcfilters-state-message-fullcoverage',
'recentchanges-noresult',