You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... 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.		4 years ago
..
accounts	Added account featured tags API (#11817)	4 years ago
admin	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
announcements	…
apps	…
crypto	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
featured_tags	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
conversations_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	Add configuration option to filter replies in lists (#9205)	4 years ago
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	…