Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-03 10:16:49 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-03 10:16:49 +02:00
admin	Fix extremely rare race condition when deleting a toot or account (#17994)	2022-04-08 19:17:37 +02:00
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	…
trends	Fix pagination header on empty trends responses in REST API (#17986)	2022-04-07 18:06:15 +02:00
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	Fix 500 error when a bookmark or favorite has been reported and deleted (#18174)	2022-04-28 23:34:58 +02:00
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	Fix 500 error when a bookmark or favorite has been reported and deleted (#18174)	2022-04-28 23:34:58 +02:00
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_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	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
streaming_controller.rb	…
suggestions_controller.rb	…