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 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		5 years ago
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
common.js	…
embed.js	…
mailer.js	…
public.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
theme.yml	Include necessary JS in auth pages	6 years ago