diff Gemfile @ 1490:b1f6665080fd

Merge from live branch
author Chris Cannam
date Mon, 17 Mar 2014 08:55:57 +0000
parents f67d6e387088
children 17c7ffe039b1 4d8c768855c6
line wrap: on
line diff
--- a/Gemfile	Tue Oct 22 13:00:01 2013 +0100
+++ b/Gemfile	Mon Mar 17 08:55:57 2014 +0000
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.2.13"
+gem "rails", "3.2.17"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"