diff options
| author | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /docs/assets/js/application.js | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
| download | bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.tar.xz bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.zip | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 4fa65cb9e..3fa5f07b7 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -92,7 +92,6 @@ .map(function () { return this.value }) .toArray() , vars = {} - , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png'] $("#less-variables input") .each(function () { @@ -107,7 +106,6 @@ js: js , css: css , vars: vars - , img: img } }) }) |