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
..
action_bar.js	Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)	2020-03-05 23:20:49 +01:00
card.js	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
detailed_status.js	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00