Merge branch 'master' into 2.0.1-wip

Conflicts: docs/assets/bootstrap.zip
2012-02-01 22:52:07 -08:00 · 2012-02-01 22:52:07 -08:00 · aa8a7668cb
commit aa8a7668cb
parent 58fd0dea36 98d1659ef8
4 changed files with 6 additions and 5 deletions
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
--- 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