diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-27 16:35:24 -0300 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-27 16:35:24 -0300 |
| commit | 2e11f8e32109f078da424f0e9a550edd4f222079 (patch) | |
| tree | bf0763fd2ffa6ce2902080ce420ab8a667309825 /activerecord/test/models/post.rb | |
| parent | f5c5d21681616c6b9240792092e656d3d1af385b (diff) | |
| parent | 494b62826b6257f145cce9ebbd58a1d842486621 (diff) | |
| download | rails-2e11f8e32109f078da424f0e9a550edd4f222079.tar.gz rails-2e11f8e32109f078da424f0e9a550edd4f222079.tar.bz2 rails-2e11f8e32109f078da424f0e9a550edd4f222079.zip | |
Merge remote-tracking branch 'origin/master'
* origin/master:
Removal of javascript related gems when creating an app
Conflicts:
railties/lib/rails/generators/app_base.rb
Diffstat (limited to 'activerecord/test/models/post.rb')
0 files changed, 0 insertions, 0 deletions