updated gem version according to upstream.
Compare changes
Files
2
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,7 +39,7 @@ Index: redmine/Gemfile