summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-03-17 10:46:17 +0100
committerSamy Pessé <samypesse@gmail.com>2015-03-17 10:46:17 +0100
commit9c0b26304b5e355d48739313bbedf983facfc20f (patch)
treee31c3af65dd611c457da94ede90de3e2e6023b5c
parentacdaea9f6cbb41e5607af9a2c7e882d3eb62f9f5 (diff)
parente481deb5bb4b376e9734ec117f53f5f8b1963007 (diff)
downloadgitbook-9c0b26304b5e355d48739313bbedf983facfc20f.zip
gitbook-9c0b26304b5e355d48739313bbedf983facfc20f.tar.gz
gitbook-9c0b26304b5e355d48739313bbedf983facfc20f.tar.bz2
Merge branch master
-rw-r--r--lib/configuration.js2
-rw-r--r--package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.js b/lib/configuration.js
index 777716e..fee40fc 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -139,7 +139,7 @@ Configuration.prototype.normalizeLanguage = function() {
Configuration.DEFAULT = {
// Options that can't be extend
"configFile": "book",
- "generator": "site",
+ "generator": "website",
"extension": null,
// Book metadats (somes are extracted from the README by default)
diff --git a/package.json b/package.json
index cb315d0..94aaa14 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"q": "1.0.1",
"lunr": "0.5.7",
- "lodash": "3.2.0",
+ "lodash": "3.5.0",
"graceful-fs": "3.0.5",
"resolve": "0.6.3",
"fs-extra": "0.16.5",