Mastodon

History

Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +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