fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 11:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/settings
History
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
applications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
deletes
exports Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
flavours
follower_domains
imports Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
migrations
notifications Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
preferences Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +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