Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts: Gemfile.lock
2014-02-22 19:27:08 +01:00
parent 35941f0f72 fce30918a9
commit 14b42ef33a
48 changed files with 343 additions and 418 deletions
--- a/1
+++ b/1
@@ -93,3 +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'