Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js		2018-10-09 21:08:26 +02:00
..
admin.js
common.js
embed.js
mailer.js
public.js
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-09 21:08:26 +02:00
theme.yml