Merge branch '1.2' into 1.3

silverstripe · Sep 8, 2017 · 4884bdd · 4884bdd
2 parents c3471ec + 4328c20
commit 4884bdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.tx/config b/.tx/config
diff --git a/code/extensions/FileSubsites.php b/code/extensions/FileSubsites.php
@@ -9,7 +9,7 @@ class FileSubsites extends DataExtension
     // If this is set to true, all folders created will be default be
     // considered 'global', unless set otherwise
     public static $default_root_folders_global = false;
-    
+
     private static $has_one=array(
         'Subsite' => 'Subsite',
     );
@@ -130,7 +130,7 @@ public function canEdit($member = null)
             return $access;
         }
     }
-    
+
     /**
      * Return a piece of text to keep DataObject cache keys appropriately specific
      */