Resolved conflicts

Author: operez-ddgi

decidim-file_authorization_handler.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "decidim", ">= 0.15"
-  s.add_dependency "decidim-admin", Decidim::FileAuthorizationHandler::VERSION
-  s.add_dependency "rails", "~> 5.1.4"
-
+  s.add_dependency "decidim", ">= #{Decidim::FileAuthorizationHandler::VERSION}"
+  s.add_dependency "decidim-admin", ">= #{Decidim::FileAuthorizationHandler::VERSION}"
+  s.add_dependency "rails", ">= 5.2"
+ 
   s.add_development_dependency "decidim-dev", Decidim::FileAuthorizationHandler::VERSION
   s.add_development_dependency "faker"
   s.add_development_dependency "letter_opener_web", ">= 1.3.4"