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

Conflicts: Gemfile.lock
2014-02-23 14:30:26 +01:00
parent aa2ef0955c 14b42ef33a
commit 28dd49bbee
5 changed files with 42 additions and 39 deletions
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'

-gem 'rails', '3.2.9'
-
+gem 'rails', '3.2.13'
+gem 'sprockets', '2.2.2'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
  gem 'mysql2'