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

Chore: update main from develop #450

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Chore: update main from develop #450

merged 4 commits into from
Nov 12, 2024

Conversation

JustSamuel
Copy link
Contributor

Description

Mostly just to push the stripe key fix upstream.

Related issues/external references

Types of changes

  • New release

@JustSamuel JustSamuel requested a review from SuperVK November 12, 2024 11:46
Copy link

Triggered from #450 by @​JustSamuel.

Checking if we can fast forward main (d5fb1db) to develop (cf8acba).

Target branch (main):

commit d5fb1db38c1b34a3a1b0ab4400314b0656ce4754 (HEAD -> main, tag: v1.10.0, origin/main)
Author: Samuel <samuel@gewis.nl>
Date:   Fri Nov 8 19:41:41 2024 +0100

    fix(pos): allow for dynamic base paths (#440)

Pull request (develop):

commit cf8acba188b1a9dde8e7d0694099482b913c56bc (pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Tue Nov 12 12:45:44 2024 +0100

    fix(dashboard): stripe key `[Object object]` (#449)

It is possible to fast forward main (d5fb1db) to develop (cf8acba). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

Copy link

Triggered from #450 by @​JustSamuel.

Checking if we can fast forward main (d5fb1db) to develop (f54605b).

Target branch (main):

commit d5fb1db38c1b34a3a1b0ab4400314b0656ce4754 (HEAD -> main, tag: v1.10.0, origin/main)
Author: Samuel <samuel@gewis.nl>
Date:   Fri Nov 8 19:41:41 2024 +0100

    fix(pos): allow for dynamic base paths (#440)

Pull request (develop):

commit f54605b57d77164f47bdd6d4a4321cc997e5f688 (pull_request/develop)
Author: Samuel <samuel@gewis.nl>
Date:   Tue Nov 12 16:03:56 2024 +0100

    fix(pos): mistake in vite config (#451)

It is possible to fast forward main (d5fb1db) to develop (f54605b). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

@JustSamuel JustSamuel merged commit f54605b into main Nov 12, 2024
10 checks passed
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.

3 participants