1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 10:18:45 +09:00
YuruToot/db
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
seeds Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
views Fix some old migration scripts (#17394) 2022-01-30 21:38:54 +01:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
seeds.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00