luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-21 06:54:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/settings
History
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
aliases
applications
deletes Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports
featured_tags Render current day formats in the client timezone (#21878) 2022-12-15 16:35:25 +01:00
flavours
imports
login_activities
migration/redirects Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
migrations Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
preferences Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shared
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
two_factor_authentication_methods