Rails 4.2.0.rc1
Fixed spec
fixed merge conflicts
updated gems
updated gems
Updated rails config files
Using secure_headers from github master
Ruby 2.1.5
Rails 4.2.0.rc3
Updated gems
fixed merge conflicts
fixed travis config
Rails 4.2.0
Updated gems
updated config files
fixed merge conflicts