tykayn 6beaa79ab3 ⚡ 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:25:58 +01:00
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
images	icons for dropdown	2020-11-01 12:10:34 +01:00
mastodon	⚡ merge master 3.0.3, feature counter	2021-01-13 14:25:58 +01:00
packs	Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020	2020-12-24 16:38:36 +01:00
styles	gallery counting	2021-01-09 19:56:49 +01:00