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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

mailer.js

Fixed improper mailer import

2018-01-15 21:23:26 -08:00

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

Fix mailer to use webpack core

2018-01-15 21:17:03 -08:00