FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/about
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
..
_features.html.haml
…
_forms.html.haml
…
_links.html.haml
…
_registration.html.haml Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
more.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
terms.html.haml
…