summaryrefslogtreecommitdiffstats
path: root/config/bootstrap.php
diff options
context:
space:
mode:
authorraylu <raylu@mixpanel.com>2011-07-02 17:02:07 -0700
committerraylu <raylu@mixpanel.com>2011-07-02 17:02:07 -0700
commit05a2b26d9038752a40348a3f226e44710833c49b (patch)
tree9bc3e49ac2e84b33ca5ff6e44eb7e5f2c02d13bf /config/bootstrap.php
parent83483a1826d1d05e2f9733746f35fef1939b8c0a (diff)
downloadotakuhub-05a2b26d9038752a40348a3f226e44710833c49b.tar.xz
pull in dev branch changes
not pulled: swiftmailer, gzip
Diffstat (limited to 'config/bootstrap.php')
-rw-r--r--config/bootstrap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/bootstrap.php b/config/bootstrap.php
index 2a46046..1ced565 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -82,6 +82,6 @@ require __DIR__ . '/bootstrap/media.php';
*/
// require __DIR__ . '/bootstrap/console.php';
-// require __DIR__ . '/bootstrap/permissions.php';
+require __DIR__ . '/bootstrap/permissions.php';
?>