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

Merge main into versions/3.0.0 #1126

Merged
merged 12 commits into from
Jan 25, 2022
Merged

Merge main into versions/3.0.0 #1126

merged 12 commits into from
Jan 25, 2022

Conversation

joachimvh
Copy link
Member

No review needed, doing PR for CI.

RubenVerborgh and others added 12 commits December 3, 2021 12:07
* Made pull request template more strict

* Update PULL_REQUEST_TEMPLATE.md
…ser follows it from solid.github.io/community-server/docs/
* fix(deps): update dependency jose to v4

* fix(deps): Update code using jose v4

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Joachim Van Herwegen <joachimvh@gmail.com>
These links don't work unless you add a trailing slash
* docker job added to ci.yml

* removed temporary manual build stuff

* updated readme for new docker image

* updated changelog

* Revert "updated changelog"

This reverts commit 20d99a2.

Co-authored-by: Thomas Dupont <thomas.dupont@intec.ugent.be>
# Conflicts:
#	package-lock.json
#	test/integration/Identity.test.ts
#	test/integration/RepresentationConverter.test.ts
@joachimvh joachimvh merged commit 90a6460 into versions/3.0.0 Jan 25, 2022
@joachimvh joachimvh deleted the chore/merge-main branch January 25, 2022 11:02
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.

6 participants