diff options
| author | Jacob Thornton <[email protected]> | 2011-06-30 10:44:04 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-06-30 10:44:04 -0700 |
| commit | 9282876b443daed99cbfac10ff6adace8b916f6b (patch) | |
| tree | 106c9ceb1f9c55e7e1f6894abe5e65de4e65834c /lib/bootstrap.less | |
| parent | 518c882da08390d45194d318ab575ed10766a382 (diff) | |
| parent | 588b2da937dd5c34766863fba3a9daaf2276d900 (diff) | |
| download | bootstrap-9282876b443daed99cbfac10ff6adace8b916f6b.tar.xz bootstrap-9282876b443daed99cbfac10ff6adace8b916f6b.zip | |
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Conflicts:
lib/bootstrap.less
Diffstat (limited to 'lib/bootstrap.less')
| -rw-r--r-- | lib/bootstrap.less | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 4c69ef86d..834d95080 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,14 +1,13 @@ - /*! - * Bootstrap v0.0.1 - * - * Copyright 2011 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Made with love by two broheims, @mdo and @fat - * Date: {{ date }} - */ - +/*! + * Bootstrap v1.0.0 + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: {{ date }} + */ // CSS Reset @import "reset.less"; |