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
..
2018-01-16 03:29:11 +01:00
2016-02-20 22:53:20 +01:00
2016-08-17 17:58:00 +02:00
2017-04-22 19:48:55 +02:00
2018-10-09 03:02:52 +02:00
2018-10-04 17:38:04 +02:00
2017-12-06 15:04:49 +09:00
2017-04-11 01:11:41 +02:00
2020-01-23 22:00:13 +01:00
2016-12-06 17:19:26 +01:00
2017-01-22 23:07:31 +01:00
2018-10-04 12:36:53 +02:00
2016-08-17 17:58:00 +02:00