merge gemfile.lock

This commit is contained in:
2014-10-19 16:30:04 +02:00
parent a696da2fa2
commit b8013a47fd

View File

@@ -266,9 +266,6 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
=======
RedCloth
acts_as_votable acts_as_votable
annotate (>= 2.5.0) annotate (>= 2.5.0)
awesome_nested_set awesome_nested_set
@@ -306,6 +303,7 @@ DEPENDENCIES
rolify rolify
rspec-rails rspec-rails
rubyzip rubyzip
sanitize!
sass-rails (~> 3.2) sass-rails (~> 3.2)
seed_dump (~> 0.5.3) seed_dump (~> 0.5.3)
simple_calendar (~> 0.1.9) simple_calendar (~> 0.1.9)