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

Merge branch 'master' of https://github.com/locomotivecms/engine

This commit is contained in:
Kev Zettler 2011-06-20 14:10:56 -07:00
parent ecbb517215 fdfa36838b
commit 41b26848ee
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -12,7 +12,6 @@ gem 'devise', '= 1.1.3'
gem 'mongoid', '~> 2.0.2'
gem 'bson_ext', '~> 1.3.0'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
# gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree', :path => '../gems/acts_as_tree'
gem 'will_paginate'
gem 'haml', '3.0.25'
@ -24,7 +23,6 @@ gem 'rmagick', '2.12.2'
gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
gem 'custom_fields', '1.0.0.beta.15'
# gem 'custom_fields', '1.0.0.beta.15', :path => '../gems/custom_fields'
gem 'fog', '0.3.7'
gem 'mimetype-fu'
gem 'actionmailer-with-request', :require => 'actionmailer_with_request'

4
Gemfile.lock
View File

@ -139,9 +139,9 @@ GEM
heroku (1.19.1)
activesupport (>= 2.1.0)
launchy (~> 0.3.2)
rest-client (< 1.7.0, >= 1.4.0)
rest-client (>= 1.4.0, < 1.7.0)
highline (1.6.2)
httparty (0.7.7)
httparty (0.7.8)
crack (= 0.1.8)
i18n (0.5.0)
inherited_resources (1.1.2)