1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
YuruToot/app
Claire 09c61e1376 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.
2021-12-27 15:16:18 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-12-27 15:16:18 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-12-27 15:16:18 +01:00
mailers Fix error on trending mailer due to missing constant (#17072) 2021-11-29 17:39:40 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-12-27 15:16:18 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-18 11:44:54 +01:00