~cytrogen/masto-fe

ref: 19ebf7797ebb64002c6b5ea8fcf2fcb8bba760bc masto-fe/lib d---------
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
f0c720cf — Claire 2 years ago
Bump version to v4.3.0-alpha.0 (#27022)

fde89a8f — Claire 2 years ago
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
82eaa26d — Claire 2 years ago
Update `tootctl maintenance fix-duplicates` to Mastodon v4.2.0 (#27147)

06444c86 — Claire 2 years ago
Fix division by zero in video in bitrate computation code (#27129)

d0d06c99 — Claire 2 years ago
Merge pull request #2422 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
86ec1e83 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
4fcc026f — Claire 2 years ago
Bump version to v4.2.0 (#27017)

c04b08a3 — Claire 2 years ago
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f05985f8 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
890e3347 — Claire 2 years ago
Add migration tests for negative settings (#27012)

5efa6ac7 — Claire 2 years ago
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
6a9e93ae — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
abcc0b38 — Claire 2 years ago
Fix incorrect PostgreSQL version check (#26979)

57f47e50 — Claire 2 years ago
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f546b0c9 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
f4b780ba — Claire 2 years ago
Bump version to v4.2.0-rc2 (#26974)

6f658680 — Claire 2 years ago
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65
22ee4e05 — Claire 2 years ago
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
Next