Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		2020-01-20 15:00:22 +01:00
..
_action_log.html.haml	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
_status.html.haml	Change reported media attachments to always be hidden in admin UI (#12879)	2020-01-18 19:50:43 +01:00
index.html.haml	Avoid using pluralize on moderation pages (#12589)	2019-12-12 19:50:23 +01:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00