aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 13:11:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 13:11:33 -0300
commitf3de18278e48097442101734cde1711d3dd6e6df (patch)
treeaca5366628d11639d655093c5bedcc4a0ccece6c /activesupport/lib/active_support/testing
parentf7552e50efc01c6e3a97a3e5b2b54478f7f7a6ab (diff)
parentb48bc869fa55a1b4622ca316a9b62b6da901402f (diff)
downloadrails-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 'activesupport/lib/active_support/testing')
0 files changed, 0 insertions, 0 deletions