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/settings
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	db/schema.rb
2018-04-14 09:12:50 -05:00
..
applications
deletes
exports
flavours
follower_domains
imports
keyword_mutes
migrations
notifications
preferences
profiles Merge remote-tracking branch 'origin/master' into gs-master 2018-04-14 09:12:50 -05:00
shared
two_factor_authentication
two_factor_authentications