mastodon/app/views/settings
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
..
applications
deletes
exports
flavours
follower_domains
imports
migrations
notifications
preferences
profiles
shared
two_factor_authentication
two_factor_authentications