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
..
components	⚡ merge master 3.0.3, feature counter	2021-01-13 14:28:16 +01:00
containers	Make “Mark media as sensitive” properly translatable (#15051)	2020-10-27 03:05:50 +01:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	icons for dropdown	2020-11-01 12:10:34 +01:00