Merge branch 'master' into derp
Conflicts: docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/docs.min.js docs/assets/js/src/application.js
Showing
+902 -541
... | ... | @@ -28,7 +28,10 @@ |
"license": "MIT", | ||
"extra": { | ||
"branch-alias": { | ||
"dev-master": "3.0.x-dev" | ||
"dev-master": "3.2.x-dev" | ||
} | ||
}, | ||
"replace": { | ||
"twitter/bootstrap": "self.version" | ||
} | ||
} |
dist/css/bootstrap-rtl.min.css
deleted
100644 → 0
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/_data/translations.yml
0 → 100644
Please register or sign in to comment