Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.		2022-01-16 18:11:20 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
admin	Remove IP tracking columns from users table (#16409)	2022-01-16 13:23:50 +01:00
announcements
apps
crypto
emails
featured_tags
instances
lists
polls
push
statuses
timelines
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_controller.rb	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02:00
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
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