projects
/
rails.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/pull/2204'
[rails.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index f0e3885033c0f4ac4bd22a136064b403639c2ce1..dc1615ffc47508cecd75556cd260902d0a366b46 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-118,7
+118,7
@@
gem "canonical-rails"
gem "logstasher"
# Used to generate images for traces
-gem "gd2-ffij"
+gem "gd2-ffij"
, ">= 0.4.0"
# Used for browser detection
gem "browser"