Merge commit '4e4bc60' into feature/rails3_merge

Conflicts: config/environment.rb
12 years ago · 307dd8e94b
parent 25d101c1a4 4e4bc603f6
commit 307dd8e94b
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 source :rubygems

-gem "rails", "2.3.15"
+gem "rails", "2.3.16"

 gem "coderay", "~> 0.9.7"
 gem "i18n", "> 0.4"