tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1' into 3.2

Browse Source 
# Conflicts:
#	code/controllers/CMSMain.php
This commit is contained in:
Damian Mooyman 2016-02-29 16:41:01 +13:00
commit 1eed3608ad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en.yml
View File

@ -126,7 +126,7 @@ en:
TreeFilteredClear: 'Clear filter'
CMSMain_left_ss:
APPLY_FILTER: 'Apply Filter'
CLEAR_FILTER: 'Clear Filter'
CLEAR_FILTER: Clear
RESET: Reset
CMSPageAddController:
MENUTITLE: 'Add page'