Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 4.2.0 #12

Merged
merged 758 commits into from
Sep 20, 2023
Merged

Upgrade to 4.2.0 #12

merged 758 commits into from
Sep 20, 2023

Conversation

ionathanch
Copy link
Collaborator

No description provided.

ClearlyClaire and others added 30 commits August 25, 2023 17:01
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
ClearlyClaire and others added 28 commits September 18, 2023 12:11
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (mastodon#26285)"

This reverts commit 8891d89.

* Revert "Do not normalize URL before fetching it (mastodon#26219)"

This reverts commit fd28431.
@ionathanch ionathanch marked this pull request as ready for review September 20, 2023 00:30
@ionathanch ionathanch merged commit fb141a5 into types.pl Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.