From: Zach Copley <zach@status.net>
Date: Thu, 7 Jul 2011 22:58:28 +0000 (-0700)
Subject: Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cb183359e23ae7a5cfb483fa06c6c4b7a8b05fff;p=quix0rs-gnu-social.git

Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157
---

cb183359e23ae7a5cfb483fa06c6c4b7a8b05fff
diff --cc lib/default.php
index 4a7d6110c5,847610aea9..51d62ed767
--- a/lib/default.php
+++ b/lib/default.php
@@@ -61,9 -61,9 +61,10 @@@ $default 
                'textlimit' => 140,
                'indent' => true,
                'use_x_sendfile' => false,
+               'cors' => true,
                'notice' => null, // site wide notice text
                'build' => 1, // build number, for code-dependent cache
 +              'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
                ),
          'db' =>
          array('database' => 'YOU HAVE TO SET THIS IN config.php',