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	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
admin	…
announcements	…
apps	…
crypto	Fix wrong route helper in encrypted messages controller (#13952)	2020-06-03 20:32:15 +02:00
featured_tags	…
instances	…
lists	…
polls	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
push	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
statuses	Fix being unable to unboost when blocked by their author (#14308)	2020-07-15 14:43:19 +02:00
timelines	Add UI option to show local-only toots in public timeline	2020-07-06 21:12:06 +02:00
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	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
preferences_controller.rb	…
reports_controller.rb	…
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	…