Merge branch 'master' into site

This commit is contained in:
Brandon Mathis 2011-08-22 17:19:34 -04:00
commit d3c6ded158
2 changed files with 6 additions and 6 deletions

View File

@ -86,7 +86,7 @@ del, s { text-decoration: line-through; }
abbr, acronym { border-bottom: 1px dotted; cursor: help; }
pre, code, tt { @extend .mono-font; }
pre, code, tt { @extend .mono; }
sub, sup { line-height: 0; }

View File

@ -1,11 +1,11 @@
GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.7)
RedCloth (4.2.8)
albino (1.3.3)
posix-spawn (>= 0.3.6)
blankslate (2.1.2.4)
chunky_png (1.2.0)
chunky_png (1.2.1)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
compass (0.11.5)
@ -29,17 +29,17 @@ GEM
maruku (0.6.0)
syntax (>= 1.0.0)
posix-spawn (0.3.6)
pygments.rb (0.1.2)
pygments.rb (0.1.3)
rubypython (>= 0.5.1)
rack (1.3.2)
rake (0.9.2)
rb-fsevent (0.4.1)
rb-fsevent (0.4.3.1)
rdiscount (1.6.8)
rubypants (0.2.0)
rubypython (0.5.1)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
sass (3.1.5)
sass (3.1.7)
stringex (1.3.0)
syntax (1.0.0)