diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-05 17:46:26 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-08 12:41:04 -0800 |
commit | c31cc963daac55f6a3bca9da99b619276911dbd7 (patch) | |
tree | bfae05fc707ae5529b60dbe10bfd5891dab8de73 /railties/lib/rails.rb | |
parent | 88cc1688d0cb828c17706b41a8bd27870f2a2beb (diff) | |
download | rails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.gz rails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.bz2 rails-c31cc963daac55f6a3bca9da99b619276911dbd7.zip |
Revert "Merge branch 'master-sec'"
This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing
changes made to f049016cd348627bf8db0d72382d7580bf802a79.
Diffstat (limited to 'railties/lib/rails.rb')
0 files changed, 0 insertions, 0 deletions