diff options
| author | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 16:19:46 -0800 |
| commit | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (patch) | |
| tree | 4f105edd66b0c13a8a99a636b4aef0bb640b883d /dist/css/bootstrap.min.css | |
| parent | bc265ac64798c01b2f35ca48ef1a65025e0c71b5 (diff) | |
| parent | 3315d4d9f4c47e67f1d1c9f6a0b262a5d8b688bd (diff) | |
| download | bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.tar.xz bootstrap-07705673b6398ae9cfe2cb59b97d61e04efeb8bf.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
Diffstat (limited to 'dist/css/bootstrap.min.css')
| -rw-r--r-- | dist/css/bootstrap.min.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css index c47e9439a..2a3e5a0a1 100644 --- a/dist/css/bootstrap.min.css +++ b/dist/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.0.3 (http://getbootstrap.com) + * Bootstrap v3.1.0 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ |