Merge branch '3.1' into 3.2

# Conflicts:
#	code/controllers/CMSMain.php
This commit is contained in:
Damian Mooyman 2016-02-29 16:41:01 +13:00
commit 1eed3608ad

View File

@ -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'