diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
| commit | 0e13f8dca10ff19397d577b0916a72129183bfeb (patch) | |
| tree | 94840c00948c1b9844be7db18b8c1623100639bd /lib/bootstrap.less | |
| parent | b4a84e1e7de1e5448cf9adc61a1a02badec80439 (diff) | |
| parent | 2589c0ac4ecc86feed81cfc5df344e0eb78cda64 (diff) | |
| download | bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.tar.xz bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
Diffstat (limited to 'lib/bootstrap.less')
| -rw-r--r-- | lib/bootstrap.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index aa0e24b96..c31bd725d 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 |