diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 06:50:45 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 10:58:53 -0300 |
| commit | 927a04da40b3d9b97cb23be7c0820eee629f0f7a (patch) | |
| tree | 17d973dea02611b7b120e479df7f1516843fa99e /activerecord/test/models/aircraft.rb | |
| parent | 9d7a748a5174224ead4d44aedc3849d1d1e37b18 (diff) | |
| download | rails-927a04da40b3d9b97cb23be7c0820eee629f0f7a.tar.gz rails-927a04da40b3d9b97cb23be7c0820eee629f0f7a.tar.bz2 rails-927a04da40b3d9b97cb23be7c0820eee629f0f7a.zip | |
Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
Fixes Scaffold generator with --assets=false
Conflicts:
railties/CHANGELOG.md
Conflicts:
railties/CHANGELOG.md
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
Diffstat (limited to 'activerecord/test/models/aircraft.rb')
0 files changed, 0 insertions, 0 deletions