diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-16 13:11:33 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-16 13:11:33 -0300 |
| commit | f3de18278e48097442101734cde1711d3dd6e6df (patch) | |
| tree | aca5366628d11639d655093c5bedcc4a0ccece6c /actionpack/lib/action_controller/metal.rb | |
| parent | f7552e50efc01c6e3a97a3e5b2b54478f7f7a6ab (diff) | |
| parent | b48bc869fa55a1b4622ca316a9b62b6da901402f (diff) | |
| download | rails-f3de18278e48097442101734cde1711d3dd6e6df.tar.gz rails-f3de18278e48097442101734cde1711d3dd6e6df.tar.bz2 rails-f3de18278e48097442101734cde1711d3dd6e6df.zip | |
Merge pull request #15113 from leafac/document-schema-conflicts
Document conflicts in `db/schema.rb` [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
0 files changed, 0 insertions, 0 deletions