mastodon/app/javascript/styles/mastodon-light
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
..
diff.scss 🐛 add icons in dropdown menu, fix style for this dropdown 2020-04-09 17:33:58 +02:00
variables.scss some fixes on the light theme 2020-02-12 10:33:10 +01:00