Permalink
Browse files

Merge branch 'hotfix/0.3.5' into development

  • Loading branch information...
noctivityinc committed May 24, 2010
2 parents b409336 + c314fbf commit a6e348c73eca760a408ec16af4cfc36069356739
Showing with 8 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +6 −0 default.gems
  3. +1 −1 git-flow-version
View
@@ -5,7 +5,7 @@ source :gemcutter
gem 'bundler', :require => nil
gem 'rubygems-update', :require => nil
-gem 'rails', '~> 2.3.6', :require => nil
+gem 'rails', '2.3.7', :require => nil
gem 'pg', '0.8.0'
View
@@ -1,12 +1,17 @@
# default.gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
+actionmailer -v2.3.7
actionmailer -v2.3.6
actionmailer -v2.3.5
+actionpack -v2.3.7
actionpack -v2.3.6
actionpack -v2.3.5
+activerecord -v2.3.7
activerecord -v2.3.6
activerecord -v2.3.5
+activeresource -v2.3.7
activeresource -v2.3.6
activeresource -v2.3.5
+activesupport -v2.3.7
activesupport -v2.3.6
activesupport -v2.3.5
acts-as-taggable-on -v2.0.6
@@ -39,6 +44,7 @@ pg -v0.9.0
pg -v0.8.0
rack -v1.1.0
rack -v1.0.1
+rails -v2.3.7
rails -v2.3.6
rails -v2.3.5
RedCloth -v4.2.3
View
@@ -1 +1 @@
-GITFLOW_VERSION=0.3.4
+GITFLOW_VERSION=0.3.5

0 comments on commit a6e348c

Please sign in to comment.