OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/views/settings
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
..
applications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
deletes
…
exports
…
flavours
…
follower_domains
…
imports Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
migrations
…
notifications
…
preferences Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
shared
…
two_factor_authentication Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
two_factor_authentications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00