mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 00:54:02 -05:00
1d1c3a808a
Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed. |
||
|---|---|---|
| .. | ||
| aliases | ||
| applications | ||
| deletes | ||
| exports | ||
| featured_tags | ||
| flavours | ||
| imports | ||
| login_activities | ||
| migration/redirects | ||
| migrations | ||
| preferences | ||
| privacy | ||
| profiles | ||
| shared | ||
| two_factor_authentication | ||
| two_factor_authentication_methods | ||
| verifications | ||