summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 10:59:51 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 10:59:51 +0100
commit22379d3a788c4d00cd12b738f01e5ca642b89ea4 (patch)
tree22819a2b77f97e116bec33f666d92eca6751edeb /Gemfile
parent8e16b8a24341fd579d97ce47512951a3d14250c1 (diff)
parent1cf48357d936056e383a52a3410f87b89e1a9829 (diff)
Merge branch 'rails_upgrade' into develop
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index c3d86f9..6e020a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.11'
gem 'bcrypt-ruby'
gem 'sqlite3'
gem 'mysql2'