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
..
assets	prototype for groups	2019-08-27 17:05:17 +02:00
chewy	Fix bookmarks also searchable (#13293)	2020-03-22 02:40:03 +01:00
controllers	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
helpers	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
javascript	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
lib	Add rate limit for reporting (#13390)	2020-04-05 14:40:08 +02:00
mailers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
models	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
policies	Add ability to delete files uploaded for settings in admin UI (#13192)	2020-03-08 16:00:24 +01:00
presenters	Fix n+1 query for bookmarks on statuses (#12494)	2019-11-28 04:08:00 +01:00
serializers	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
services	Fix returning results when searching for URL with non-zero offset (#13377)	2020-04-02 03:39:37 +02:00
validators	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
views	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
workers	Fix trying to delete already deleted file when post-processing (#13406)	2020-04-06 14:11:22 +02:00