me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/settings/preferences
History
Claire f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' 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 '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' 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