Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
containers	Make the "mark media as sensitive" button more obvious in web UI (#10673)	2019-05-03 04:34:55 +02:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00