luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 18:14:09 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config/webpack/loaders
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
..
assets.js
babel.js Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
babel_external.js
mark.js
sass.js Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00