Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		2019-05-23 19:01:30 +02:00
..
accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
apps	…
instances	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
lists	…
polls	…
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
timelines	…
accounts_controller.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
follows_controller.rb	…
instances_controller.rb	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
lists_controller.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
search_controller.rb	…
statuses_controller.rb	Add API support for setting status content-type	2019-05-17 23:51:14 +02:00
streaming_controller.rb	…
suggestions_controller.rb	…