Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||