Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||