Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock |
||
|---|---|---|
| .. | ||
| application_controller.rb | ||
| articles_controller.rb | ||
| dummy_controller.rb | ||
| posts_controller.rb | ||
| widgets_controller.rb | ||
Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock |
||
|---|---|---|
| .. | ||
| application_controller.rb | ||
| articles_controller.rb | ||
| dummy_controller.rb | ||
| posts_controller.rb | ||
| widgets_controller.rb | ||