marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript/packs
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
..
about.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
application.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
common.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
public.js Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
share.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00