updated gem version according to upstream.
Compare changes
Files
4
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -29,7 +29,7 @@ Index: redmine/Gemfile
@@ -39,9 +39,10 @@ Index: redmine/Gemfile
@@ -54,7 +55,7 @@ Index: redmine/Gemfile