Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
admin.js	…
common.js	…
embed.js	…
mailer.js	…
public.js	…
settings.js	…
theme.yml	Include necessary JS in auth pages	2019-06-13 22:38:22 +02:00