Added php router file and added setting to disable mandrill

commercialprogression · Jan 26, 2016 · 59a6fee · 59a6fee
1 parent aa02c82
commit 59a6fee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore_global b/.gitignore_global
@@ -60,4 +60,5 @@ nbproject
 .vagrant
 .idea
 node_modules
-bower_components
+bower_components
+php_server.router.inc
diff --git a/local.settings.php b/local.settings.php
@@ -23,6 +23,7 @@
 $conf['preprocess_css'] = 0;
 $conf['preprocess_js'] = 0;
 $conf['securepages_enable'] = FALSE;
+$conf['mandrill_api_key'] = FALSE;
 
 /**
  * Databases.