Merge pull request #110 from two-pack/master

'zip' gem conflicts with 'rubyzip' on Redmine XLS Export Plugin.
This commit is contained in:
Daniel Munn 2013-03-28 04:21:41 -07:00
commit 17a78e855e
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
source :rubygems
gem "zip"
gem "rubyzip"
gem "simple_enum"
gem "nokogiri", ">= 1.4.2"
gem "uuidtools", "~> 2.1.1"

View File

@ -48,7 +48,7 @@ As of version 1.4.4 of this plugin:
* Bundler 1.1 or greater (Gem)
* Redmine 2.0.x
* Rails 3.2.x (Inline with Redmine installation requirement)
* zip (Gem)
* rubyzip (Gem)
* Nokogiri 1.4.2 or greater (Gem)
* UUIDTools 2.1.1 or greater (less than 2.2.0) (Gem)
* simple_enum (Gem)