diff options
| author | Mark Otto <[email protected]> | 2013-11-30 13:09:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 13:09:55 -0800 |
| commit | 82bbccde9bc91543e7b1a4612d4d87c75c737bba (patch) | |
| tree | e8abb61d6f8d58b20481e2704e5782cf3af1427f /dist/css/bootstrap-theme.css | |
| parent | 702ad4c3025c8db0ec482e5eccd339cf1e6c2a5a (diff) | |
| parent | 56113201017cc15bc677a99f61730b2a34cac2a5 (diff) | |
| download | bootstrap-82bbccde9bc91543e7b1a4612d4d87c75c737bba.tar.xz bootstrap-82bbccde9bc91543e7b1a4612d4d87c75c737bba.zip | |
Merge branch 'master' into pr/11648
Conflicts:
dist/css/bootstrap.min.css
less/grid.less
Diffstat (limited to 'dist/css/bootstrap-theme.css')
| -rw-r--r-- | dist/css/bootstrap-theme.css | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css index c9c347e41..00059f08c 100644 --- a/dist/css/bootstrap-theme.css +++ b/dist/css/bootstrap-theme.css @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.2 by @fat and @mdo + * Bootstrap v3.0.2 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. */ .btn-default, |