nyastodon/config/environments
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
..
development.rb Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00
production.rb Move CSP headers to the appropriate Rails configuration 2018-08-22 20:39:33 +02:00
test.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00