diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
| commit | a42e9163cbf6dcdd72a004a4a7c2b787478e18b0 (patch) | |
| tree | 6ba50185884ca0a425d7185ac63949102d96002e /README.md | |
| parent | 303f8a33c354b5c8f6132574de55114b8f39a1f1 (diff) | |
| parent | ed0d556847a7a1168a05a6a71f8f1af23139327b (diff) | |
| download | bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.tar.xz bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.zip | |
Merge branch 'master' into responsive-visibility-table
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,4 +1,5 @@ # [Bootstrap](http://getbootstrap.com) [](http://travis-ci.org/twbs/bootstrap) [](https://david-dm.org/twbs/bootstrap#info=devDependencies) +[](https://saucelabs.com/u/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). |