Skip to content

B
bootstrap
Commit 91e9f6fa authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 

Conflicts:
	docs/assets/css/bootstrap.css
parents 22359f9d 065ed01b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
docs/assets/css/bootstrap.css
View file @ 91e9f6fa
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 14:48:21 PST 2012 * Date: Fri Jan 27 14:48:53 PST 2012
*/ */
article, article,
aside, aside,
......
docs/build/index.js
View file @ 91e9f6fa
...@@ -14,6 +14,8 @@ pages = fs.readdirSync(__dirname + '/../templates/pages') ...@@ -14,6 +14,8 @@ pages = fs.readdirSync(__dirname + '/../templates/pages')
// iterate over pages // iterate over pages
pages.forEach(function (name) { pages.forEach(function (name) {
if (!name.match(/\.mustache$/)) return
var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8') var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8')
, context = {} , context = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment