You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		5 years ago
..
_action_log.html.haml	Improve report layout (#7188)	7 years ago
_status.html.haml	Change reported media attachments to always be hidden in admin UI (#12879)	5 years ago
index.html.haml	Avoid using pluralize on moderation pages (#12589)	5 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago