merge fiy

This commit is contained in:
2014-10-17 10:21:04 +02:00
parent 46490d73bf
commit c64e2f9e5a

View File

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