Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		2020-07-22 13:38:17 +02:00
..
accounts
admin
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps
crypto
featured_tags
instances
lists
polls
push
statuses	Fix being unable to unboost when blocked by their author (#14308)	2020-07-15 14:43:19 +02:00
timelines
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	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
favourites_controller.rb
featured_tags_controller.rb	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
preferences_controller.rb
reports_controller.rb	Add rate limit for reporting (#13390)	2020-04-05 14:40:08 +02:00
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
streaming_controller.rb
suggestions_controller.rb
trends_controller.rb