mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 21:33:21 +00:00
aeacebb3d7
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| apps | ||
| crypto | ||
| emails | ||
| featured_tags | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_controller.rb | ||
| announcements_controller.rb | ||
| apps_controller.rb | ||
| blocks_controller.rb | ||
| bookmarks_controller.rb | ||
| conversations_controller.rb | ||
| custom_emojis_controller.rb | ||
| directories_controller.rb | ||
| domain_blocks_controller.rb | ||
| endorsements_controller.rb | ||
| favourites_controller.rb | ||
| featured_tags_controller.rb | ||
| filters_controller.rb | ||
| follow_requests_controller.rb | ||
| followed_tags_controller.rb | ||
| instances_controller.rb | ||
| lists_controller.rb | ||
| markers_controller.rb | ||
| media_controller.rb | ||
| mutes_controller.rb | ||
| notifications_controller.rb | ||
| polls_controller.rb | ||
| preferences_controller.rb | ||
| reports_controller.rb | ||
| scheduled_statuses_controller.rb | ||
| statuses_controller.rb | ||
| streaming_controller.rb | ||
| suggestions_controller.rb | ||
| tags_controller.rb | ||