mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 06:05:56 +00:00
Merge branch '3.1' into 3.2
# Conflicts: # code/controllers/CMSMain.php
This commit is contained in:
commit
1eed3608ad
@ -126,7 +126,7 @@ en:
|
|||||||
TreeFilteredClear: 'Clear filter'
|
TreeFilteredClear: 'Clear filter'
|
||||||
CMSMain_left_ss:
|
CMSMain_left_ss:
|
||||||
APPLY_FILTER: 'Apply Filter'
|
APPLY_FILTER: 'Apply Filter'
|
||||||
CLEAR_FILTER: 'Clear Filter'
|
CLEAR_FILTER: Clear
|
||||||
RESET: Reset
|
RESET: Reset
|
||||||
CMSPageAddController:
|
CMSPageAddController:
|
||||||
MENUTITLE: 'Add page'
|
MENUTITLE: 'Add page'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user