diff index.php @ 60:63ea1cfd387d

Branch merge
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Thu, 11 Oct 2012 17:05:25 +0200
parents 0e157721bbad
children b7efe2ecbc11
line wrap: on
line diff
--- a/index.php	Thu Oct 11 02:05:09 2012 +0200
+++ b/index.php	Thu Oct 11 17:05:25 2012 +0200
@@ -59,6 +59,7 @@
     $parent->removeChild($param);
   }
 }
+$master = getFiles($master, $options);
 
 if (CACHING && $cacheable)
   $options->getCache()->CheckHttpModified();