Merge branch 'master' into remove-externals
diff --git a/rebar.config.script b/rebar.config.script
index 425b458..88cec89 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -32,7 +32,7 @@
io:fwrite("Check https://docs.couchdb.org/en/latest/whatsnew/index.html for the~n"),
io:fwrite("latest information on supported releases.~n"),
case os:getenv("TRAVIS") of
- "true" ->
+ "true" ->
io:fwrite("Travis run, ignoring bad release. You have been warned!~n"),
ok;
_ -> halt(1)
@@ -110,7 +110,7 @@
{docs, {url, "https://github.com/apache/couchdb-documentation"},
{tag, "2.3.0"}, [raw]},
{fauxton, {url, "https://github.com/apache/couchdb-fauxton"},
- {tag, "v1.1.20"}, [raw]},
+ {tag, "v1.2.0"}, [raw]},
%% Third party deps
{folsom, "folsom", {tag, "CouchDB-0.8.3"}},
{hyper, "hyper", {tag, "CouchDB-2.2.0-4"}},
