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
..
_theme.html.haml
admin.html.haml	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
application.html.haml
auth.html.haml
embedded.html.haml	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml