diff options
| author | Jacob Thornton <[email protected]> | 2011-08-30 23:37:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-30 23:37:46 -0700 |
| commit | 90d174a34d0c1c0da590fa8f21b1852e358ba0f9 (patch) | |
| tree | 4c1a1bea6a3aba0e39c1f1310f7fbe928131246f /lib | |
| parent | 4fb1c5bd4b527797183a60e752f0276b01637fd5 (diff) | |
| parent | 44b18f4911e125cc07a6d56292983b0cbfa3ae19 (diff) | |
| download | bootstrap-90d174a34d0c1c0da590fa8f21b1852e358ba0f9.tar.xz bootstrap-90d174a34d0c1c0da590fa8f21b1852e358ba0f9.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
README.md
bootstrap-1.2.0.css
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scaffolding.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index c0272908f..a0dee789c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -107,4 +107,4 @@ a { color: @linkColorHover; text-decoration: underline; } -}
\ No newline at end of file +} |