djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 18:40:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
8b6247ca44
tootlab-mastodon/app/views/settings/preferences
History
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
2024-10-05 20:45:05 +02:00
..
appearance Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00
notifications Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00
other Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00