diff options
| author | Mark Otto <[email protected]> | 2012-01-29 16:42:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-29 16:42:37 -0800 |
| commit | b0976bb379d2c8826c13769a53f94079aa161c45 (patch) | |
| tree | 78000a54f3530355ee6fb23d4c35cfc5a7ded750 /docs | |
| parent | 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 (diff) | |
| parent | 298e637d004c66a0e4351c7ce4a8d03866b75f66 (diff) | |
| download | bootstrap-b0976bb379d2c8826c13769a53f94079aa161c45.tar.xz bootstrap-b0976bb379d2c8826c13769a53f94079aa161c45.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 51339 -> 51339 bytes | |||
| -rw-r--r-- | docs/assets/js/application.js | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex bd974a462..7a18bce0d 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 585700f8e..b29b63aee 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -123,7 +123,7 @@ .map(function () { return this.value }) .toArray() , vars = {} - , img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png'] + , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png'] $("#variables.download input") .each(function () { |