github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging sgrove-master into master

This commit is contained in:
did 2011-04-27 16:09:21 +02:00
parent 8b5d5d0a32 7b30c34a9b
commit 483dfc350b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -253,7 +253,7 @@ GEM
polyglot (>= 0.3.1)
trollop (1.16.2)
tzinfo (0.3.27)
unicorn (3.6.0)
unicorn (3.6.1)
kgio (~> 2.3)
rack
warden (0.10.7)

2
locomotive_cms.gemspec
View File

@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_dependency "json_pure", "1.5.1"
s.add_dependency "bushido"
s.add_dependency "heroku", "1.19.1" # "1.18.2"
s.add_dependency "heroku", "1.19.1"
s.add_dependency "rmagick", "2.12.2"
s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"