updated from master

This commit is contained in:
Brandon Mathis 2012-07-31 15:02:49 -05:00
parent 92baa93301
commit 15de735100
3 changed files with 6 additions and 6 deletions

View File

@ -1 +1 @@
1.9.2-p290
1.9.3-p0

2
.rvmrc
View File

@ -1 +1 @@
rvm use 1.9.2
rvm use 1.9.3

View File

@ -8,7 +8,7 @@ GEM
chunky_png (1.2.5)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
compass (0.12.1)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
@ -25,12 +25,12 @@ GEM
liquid (~> 2.3)
maruku (~> 0.5)
jsmin (1.0.1)
kramdown (0.13.6)
kramdown (0.13.7)
liquid (2.3.0)
maruku (0.6.0)
syntax (>= 1.0.0)
posix-spawn (0.3.6)
pygments.rb (0.2.12)
pygments.rb (0.2.13)
rubypython (~> 0.5.3)
rack (1.4.1)
rack-protection (1.2.0)
@ -45,7 +45,7 @@ GEM
rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
sass (3.1.18)
sass (3.1.20)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)