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
bd349cb850
tootlab-mastodon/app/views/settings/preferences
History
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
..
appearance Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
notifications Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
other Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00