Baptiste Lemoine e50cb7160a 🐛 add icons in dropdown menu, fix style for this dropdown ... 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		2020-04-09 17:33:58 +02:00
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
images	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
mastodon	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
packs	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
styles	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00