aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-26 23:14:48 -0700
committerfat <[email protected]>2013-07-26 23:14:48 -0700
commitec42ddf1f4d380a7385d29f996c5ede55c4cc602 (patch)
treeac230d00b96329998db3f329a3229df0877635e5
parentb1e01a1b04b88514f29fa66b8ca2c73c858ce85b (diff)
parent40d398bcd01e538d388b1dce376b47be63b5feb7 (diff)
downloadbootstrap-ec42ddf1f4d380a7385d29f996c5ede55c4cc602.tar.xz
bootstrap-ec42ddf1f4d380a7385d29f996c5ede55c4cc602.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
-rw-r--r--CNAME1
-rw-r--r--_config.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CNAME b/CNAME
new file mode 100644
index 000000000..52c853392
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+getbootstrap.com
diff --git a/_config.yml b/_config.yml
index 57b22942e..fcca4c48d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,7 +7,7 @@ permalink: pretty
# Server
destination: ./_gh_pages
-exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"]
+exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "CNAME", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"]
port: 9001
# Custom vars