andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

gemfile fix

Browse Source
This commit is contained in:
Andreas Stephanides
2014-02-23 14:26:01 +01:00
parent fce30918a9
commit aa2ef0955c
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -93,4 +93,4 @@ gem "seed_dump", "~> 0.5.3"
#gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'
#gem "themes_for_rails", :git=> 'git://github.com/lucasefe/themes_for_rails.git'
gem 'themes_for_rails'
gem 'remotipart', :git =>'git://github.com/JangoSteve/remotipart.git'

17
Gemfile.lock
View File

@@ -90,22 +90,14 @@ GEM
actionpack (>= 3.0)
formtastic-bootstrap (2.1.3)
formtastic (~> 2.2)
<<<<<<< HEAD
git (1.2.5)
=======
git (1.2.6)
>>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
globalize (3.0.4)
activemodel (>= 3.0.0, < 4.0.0)
activerecord (>= 3.0.0, < 4.0.0)
globalize-versioning (0.1.0.alpha.1)
globalize (>= 3, < 5)
paper_trail (~> 3.0.0)
<<<<<<< HEAD
haml (4.0.0)
=======
haml (4.0.5)
>>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
tilt
hashie (2.0.5)
hike (1.2.3)
@@ -118,13 +110,9 @@ GEM
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
<<<<<<< HEAD
jquery-ui-rails (4.1.1)
railties (>= 3.1.0)
json (1.7.7)
=======
json (1.8.1)
>>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
jwt (0.1.8)
multi_json (>= 1.5)
libv8 (3.16.14.3)
@@ -159,13 +147,8 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
<<<<<<< HEAD
orm_adapter (0.4.0)
paperclip (3.4.0)
=======
orm_adapter (0.5.0)
paperclip (3.4.2)
>>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)