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

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-26 14:23:24 +02:00

common.js

Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

embed.js

…

mailer.js

…

public.js

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-18 18:04:49 +02:00

settings.js

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-09 21:08:26 +02:00

theme.yml

…