Conflicts: app/controllers/login_controller.rb app/models/message.rb app/views/sessions/new.html.haml |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| documents | ||
| helpers | ||
| inputs | ||
| mailers | ||
| models | ||
| views | ||
| workers | ||
Conflicts: app/controllers/login_controller.rb app/models/message.rb app/views/sessions/new.html.haml |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| documents | ||
| helpers | ||
| inputs | ||
| mailers | ||
| models | ||
| views | ||
| workers | ||