diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-18 18:21:53 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-18 18:22:37 -0300 |
commit | 533c035205a49e7ce9e23661b326d37d9f43dc03 (patch) | |
tree | ac1bbca69873c69aebe1af44f042a3a705e321e6 /actionview/test/fixtures/helpers | |
parent | dc59a08fe74d7a6e6b789bcc775087eb94e05311 (diff) | |
parent | cc1ad787af462e03be5ff1805c3d176569cc1e2f (diff) | |
download | rails-533c035205a49e7ce9e23661b326d37d9f43dc03.tar.gz rails-533c035205a49e7ce9e23661b326d37d9f43dc03.tar.bz2 rails-533c035205a49e7ce9e23661b326d37d9f43dc03.zip |
Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging
Additional help messaging to help the user resolve a conflicted migration
Diffstat (limited to 'actionview/test/fixtures/helpers')
0 files changed, 0 insertions, 0 deletions