mastodon/app
tykayn 39bcc2a0c0 merge master 3.0.3, feature counter
Merge remote-tracking branch 'origin'

Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

# Conflicts:
#	.ruby-version
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/features/direct_timeline/components/conversation.js
#	app/javascript/mastodon/features/getting_started/components/announcements.js
#	app/javascript/mastodon/locales/fr.json
#	config/locales/kab.yml
#	config/locales/ta.yml
#	yarn.lock
2021-01-13 14:28:16 +01:00
..
assets prototype for groups 2019-08-27 17:05:17 +02:00
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020 2020-12-24 16:38:36 +01:00
helpers Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020 2020-12-24 16:38:36 +01:00
javascript merge master 3.0.3, feature counter 2021-01-13 14:28:16 +01:00
lib Improve account deletion performances further (#15407) 2020-12-22 23:57:46 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models disable snow 2020-12-30 17:54:44 +01:00
policies Fix admins being able to suspend their instance actor (#14567) 2020-12-15 17:23:58 +01:00
presenters Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
serializers Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020 2020-12-24 16:38:36 +01:00
services Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00
validators Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020 2020-12-24 16:38:36 +01:00
views Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020 2020-12-24 16:38:36 +01:00
workers Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00