Merged r14078.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14096 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-14 15:14:01 +00:00
parent b956621b01
commit 8a26ce6a75

View File

@@ -14,6 +14,9 @@ gem "protected_attributes"
gem "actionpack-action_caching"
gem "actionpack-xml_parser"
# building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414
gem "ffi", "1.9.6"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
gem "rbpdf", "~> 1.18.5"