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
..
migrate	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
post_migrate	Validate Web::PushSubscription (#11971)	2019-09-27 15:24:13 +02:00
schema.rb	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00