merge fiy
This commit is contained in:
@@ -266,6 +266,9 @@ 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
|
||||||
@@ -303,7 +306,6 @@ 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)
|
||||||
|
|||||||
Reference in New Issue
Block a user