Merge remote branch 'gitorious/1.0.x' into 1.0.x

2010-10-27 13:47:54 -04:00 · 2010-10-27 13:47:54 -04:00 · 9e15290963
commit 9e15290963
parent 563b4f968a 1851933c34
1 changed files with 1 additions and 0 deletions
--- a/lib/default.php
+++ b/lib/default.php
@ -301,6 +301,7 @@ $default =
                                 'WikiHashtags' => null,
                                 'RSSCloud' => null,
                                 'ClientSideShorten' => null,
+                                 'StrictTransportSecurity' => null,
                                 'OpenID' => null),
              'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
              ),