Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock |
||
|---|---|---|
| .. | ||
| controllers | ||
| fixtures | ||
| intializers | ||
| models | ||
| rails_generators | ||
| spec_helper.rb | ||
Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock |
||
|---|---|---|
| .. | ||
| controllers | ||
| fixtures | ||
| intializers | ||
| models | ||
| rails_generators | ||
| spec_helper.rb | ||