diff options
author | fat <jacobthornton@gmail.com> | 2013-07-27 11:53:01 +0400 |
---|---|---|
committer | fat <jacobthornton@gmail.com> | 2013-07-27 11:53:01 +0400 |
commit | a940c96fb3de0bb9b98d6af8b1b2f16c9fa8fd93 (patch) | |
tree | 9464e3192083c0200aaf3a72d6acf1508677c714 | |
parent | 49dd72cd81dabad6faa801ed55aea5da88b305ef (diff) | |
parent | e45106ea0915cb82a52b13c101a0513dc7754111 (diff) |
Merge branch 'master' of heroku.com:bootstrap
Conflicts:
lib/css.js
-rw-r--r-- | index.js | 2 | ||||
-rw-r--r-- | lib/css.js | 4 | ||||
-rw-r--r-- | lib/img.js | 2 | ||||
-rw-r--r-- | lib/js.js | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -73,4 +73,4 @@ app.post('/', function(req, res) { res.send(archive.toBuffer()) }) -app.listen(process.env.PORT || 3000)
\ No newline at end of file +app.listen(process.env.PORT || 3000) @@ -23,8 +23,8 @@ var path = require('path') , https = require('https') , less = require('less') , CACHE = {} - , TAG = "v2.3.1" - , CW = "/*!\n * Bootstrap v2.3.1\n *\n * Copyright 2013 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 by @mdo and @fat.\n */\n" + , TAG = "v2.3.2" + , CW = "/*!\n * Bootstrap v2.3.2\n *\n * Copyright 2013 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. You've likely entered an invalid input into the less variable field. Check your syntax and try again!\n\n thanks!\n\n" , FILES = [ // CSS Reset "reset.less" @@ -21,7 +21,7 @@ var path = require('path') , https = require('https') - , TAG = 'v2.3.1' + , TAG = 'v2.3.2' , CACHE = {} , FILES = [ 'glyphicons-halflings.png' , 'glyphicons-halflings-white.png' ] @@ -22,7 +22,7 @@ var uglifyJS = require('uglify-js') , path = require('path') , https = require('https') - , TAG = 'v2.3.1' + , TAG = 'v2.3.2' , CACHE = {} , FILES = [ "bootstrap-transition.js" , "bootstrap-affix.js" |