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
..
_account.html.haml	accept merge from upstream	2020-03-08 17:32:42 +01:00
index.html.haml	accept merge from upstream	2020-03-08 17:32:42 +01:00
show.html.haml	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00