diff options
| author | fat <[email protected]> | 2014-07-06 14:11:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-07-06 14:11:23 -0700 |
| commit | b19719ea1af17aafc18cd2dd8963a95498cb1d20 (patch) | |
| tree | a2e052994f65bd7819c0967bb538eaa874cea1a2 /dist/css/bootstrap.css | |
| parent | c08e275000330db6d8883de6af2243216cc79837 (diff) | |
| parent | 7627b24c1e6aa5301ee3f525dd931c2852e7ff0a (diff) | |
| download | bootstrap-b19719ea1af17aafc18cd2dd8963a95498cb1d20.tar.xz bootstrap-b19719ea1af17aafc18cd2dd8963a95498cb1d20.zip | |
Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test
Conflicts:
js/tests/unit/scrollspy.js
Diffstat (limited to 'dist/css/bootstrap.css')
0 files changed, 0 insertions, 0 deletions