e5f934ddf0
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| locales-glitch | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.ignore | ||
| database.yml | ||
| deploy.rb | ||
| environment.rb | ||
| i18n-tasks.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| routes.rb | ||
| secrets.yml | ||
| settings.yml | ||
| sidekiq.yml | ||
| webpacker.yml | ||