diff options
| author | Mark Otto <[email protected]> | 2012-02-01 22:52:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-01 22:52:07 -0800 |
| commit | aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3 (patch) | |
| tree | 2500ca303c185b7ff28bb8e3daa70d98b1b3c97f /docs | |
| parent | 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 (diff) | |
| parent | 98d1659ef836cb879ce7d6260351ff35e96ebd25 (diff) | |
| download | bootstrap-aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3.tar.xz bootstrap-aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3.zip | |
Merge branch 'master' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56825 -> 52356 bytes | |||
| -rw-r--r-- | docs/assets/js/application.js | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 4647e747b..faef1d7ea 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 b29b63aee..732bed458 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -135,8 +135,7 @@ , url: 'http://bootstrap.herokuapp.com' , dataType: 'jsonpi' , params: { - branch: '2.0-wip' - , js: js + js: js , css: css , vars: vars , img: img |