Conflicts: config/environment.rb
@ -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"