tykayn d96d645e0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # yarn.lock		2021-01-13 14:45:58 +01:00
..
components	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
containers	Make “Mark media as sensitive” properly translatable (#15051)	2020-10-27 03:05:50 +01:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	icons for dropdown	2020-11-01 12:10:34 +01:00