Merge remote-tracking branch 'origin/3.0' into 3.1

silverstripe · Jul 1, 2013 · 0b59ef4 · 0b59ef4
2 parents 623685a + 4fd7552
commit 0b59ef4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.htaccess b/.htaccess
@@ -12,7 +12,7 @@
 
 # This denies access to all yml files, since developers might include sensitive
 # information in them. See the docs for work-arounds to serve some yaml files
-<Files *.yml>
+<Files ~ "\.ya?ml$">
 	Order allow,deny
 	Deny from all
 </Files>