diff options
author | Jacob Thornton <jacobthornton@gmail.com> | 2012-08-21 03:50:26 +0400 |
---|---|---|
committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-08-21 03:50:26 +0400 |
commit | 4ec508bb86be48dd14ae7240cb932e66a45e22f0 (patch) | |
tree | 69ed97982561a078b641de0c43b9755e5bf0a998 | |
parent | 4e0504726279268a5e373d6b30a79a320ec3f8b0 (diff) | |
parent | a19b369089f657905dfa595b04b0161643ff703b (diff) |
Merge branch 'master' of github.com:twitter/bootstrap-server
Conflicts:
lib/css.js
-rw-r--r-- | lib/css.js | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ var path = require('path') , CACHE = {} , BRANCH = "master" , CW = "/*!\n * Bootstrap v2.1.0\n *\n * Copyright 2012 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n" - , ERROR = "A less error occured trying to build your bundle. Please paste the error below in an issue for us at http://github.com/twitter/bootsrap! thanks!\n\n" + , ERROR = "A less error occured trying to build your bundle. Please paste the error below in an issue for us at http://github.com/twitter/bootstrap! thanks!\n\n" , FILES = [ "variables.less" , "mixins.less" , "reset.less" |