changeset 1461:926dce5f5778 live

Merge fix from luisf branch
author Chris Cannam
date Mon, 06 Jan 2014 15:53:59 +0000
parents 46a444fa87bc (diff) cf78a7ade302 (current diff)
children 274b89aabe38
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Gemfile	Mon Nov 11 18:25:50 2013 +0000
+++ b/Gemfile	Mon Jan 06 15:53:59 2014 +0000
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.2.13"
+gem "rails", "3.2.16"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"