aboutsummaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-07-16 19:46:55 -0700
committerBrandon Mathis <brandon@imathis.com>2011-07-16 19:46:55 -0700
commited17a8a9276cc9aab3410105b9f4d902ede6e45f (patch)
tree5ffe2ec8e8035f8f02dbd5e6961c5a18d36614e4 /Gemfile.lock
parent575ad6d6a1d9a78485659c5cef7bed9fb3401e19 (diff)
parent31b578b06704e0d7234bdebb5c4b84d80dd1b54e (diff)
downloadmy_new_personal_website-ed17a8a9276cc9aab3410105b9f4d902ede6e45f.tar.xz
my_new_personal_website-ed17a8a9276cc9aab3410105b9f4d902ede6e45f.zip
Merge pull request #35 from smt/pull-request-1
Updated Gemfile.lock and some deprecated Compass mixin args
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock20
1 files changed, 13 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b103020e..302cc44c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,31 +2,37 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.7)
+ albino (1.3.3)
+ posix-spawn (>= 0.3.6)
chunky_png (1.2.0)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
- compass (0.11.3)
+ compass (0.11.5)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
directory_watcher (1.4.0)
fast-stemmer (1.0.0)
fssm (0.2.7)
- haml (3.1.1)
- jekyll (0.10.0)
+ haml (3.1.2)
+ jekyll (0.11.0)
+ albino (>= 1.3.2)
classifier (>= 1.3.1)
directory_watcher (>= 1.1.1)
+ kramdown (>= 0.13.2)
liquid (>= 1.9.0)
maruku (>= 0.5.9)
+ kramdown (0.13.3)
liquid (2.2.2)
maruku (0.6.0)
syntax (>= 1.0.0)
- rack (1.3.0)
- rake (0.9.0)
- rb-fsevent (0.4.0)
+ posix-spawn (0.3.6)
+ rack (1.3.1)
+ rake (0.9.2)
+ rb-fsevent (0.4.1)
rdiscount (1.6.8)
rubypants (0.2.0)
- sass (3.1.2)
+ sass (3.1.4)
syntax (1.0.0)
PLATFORMS