mirror of https://github.com/tootsuite/mastodon
e2a2bc9021
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. |
||
|---|---|---|
| .. | ||
| accept.rb | ||
| add.rb | ||
| announce.rb | ||
| block.rb | ||
| create.rb | ||
| delete.rb | ||
| flag.rb | ||
| follow.rb | ||
| like.rb | ||
| move.rb | ||
| reject.rb | ||
| remove.rb | ||
| undo.rb | ||
| update.rb | ||