Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfat <jacobthornton@gmail.com>2013-07-27 11:53:01 +0400
committerfat <jacobthornton@gmail.com>2013-07-27 11:53:01 +0400
commita940c96fb3de0bb9b98d6af8b1b2f16c9fa8fd93 (patch)
tree9464e3192083c0200aaf3a72d6acf1508677c714
parent49dd72cd81dabad6faa801ed55aea5da88b305ef (diff)
parente45106ea0915cb82a52b13c101a0513dc7754111 (diff)
Merge branch 'master' of heroku.com:bootstrap
Conflicts: lib/css.js
-rw-r--r--index.js2
-rw-r--r--lib/css.js4
-rw-r--r--lib/img.js2
-rw-r--r--lib/js.js2
4 files changed, 5 insertions, 5 deletions
diff --git a/index.js b/index.js
index aedecfd..7573915 100644
--- a/index.js
+++ b/index.js
@@ -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)
diff --git a/lib/css.js b/lib/css.js
index 0fe3617..58dc37d 100644
--- a/lib/css.js
+++ b/lib/css.js
@@ -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"
diff --git a/lib/img.js b/lib/img.js
index 070ff4b..6094c13 100644
--- a/lib/img.js
+++ b/lib/img.js
@@ -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' ]
diff --git a/lib/js.js b/lib/js.js
index 373ba00..796d383 100644
--- a/lib/js.js
+++ b/lib/js.js
@@ -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"