Merge remote branch 'origin/master' into translation-staging

This commit is contained in:
TeamCity 2012-10-31 11:57:06 +13:00
commit 6327d72b3c

View File

@ -140,8 +140,8 @@ JS
// File listing
$gridFieldConfig = GridFieldConfig::create()->addComponents(
new GridFieldToolbarHeader(),
new GridFieldFilterHeader(),
new GridFieldSortableHeader(),
new GridFieldFilterHeader(),
new GridFieldDataColumns(),
new GridFieldPaginator(15),
new GridFieldEditButton(),