luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/fixtures
History
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
..
files Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
push Handle delete Salmons, todo: clean up timelines 2016-09-04 14:44:16 +02:00
requests Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
salmon