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

update(vaultwarden): bump version to 1.32.0 #37

Merged
merged 1 commit into from
Aug 12, 2024

Conversation

CherryKitten
Copy link
Member

@CherryKitten CherryKitten requested a review from a team as a code owner August 12, 2024 07:28
@CherryKitten
Copy link
Member Author

/fast-forward

Copy link

Triggered from #37 (comment) by @​CherryKitten.

Trying to fast forward main (dbec405) to sammy/update-vaultwarden (38271e4).

Target branch (main):

commit dbec4053596084e595ece42a3595a2bfa111cd0f (HEAD -> main, origin/main, origin/HEAD)
Author: Sammy <[email protected]>
Date:   Thu Jun 13 11:52:21 2024 +0200

    chore: add ff-merge workflow

Pull request (sammy/update-vaultwarden):

commit 38271e492dde87c302ddccf25ba308d6dacd09fd (pull_request/sammy/update-vaultwarden)
Author: Sammy <[email protected]>
Date:   Mon Aug 12 09:23:55 2024 +0200

    update(vaultwarden): bump version to 1.32.0

Can't fast forward main (dbec405) to sammy/update-vaultwarden (38271e4). main (dbec405) is not a direct ancestor of sammy/update-vaultwarden (38271e4). Branches appear to have diverged at 8221014:

* 38271e492dde87c302ddccf25ba308d6dacd09fd update(vaultwarden): bump version to 1.32.0
| * dbec4053596084e595ece42a3595a2bfa111cd0f chore: add ff-merge workflow
| * 403177a77a30131bb2e35d259c11aaa995155a6e feat(netbox): initial role
|/  
* 8221014ea1472fa2a5d383a8a589fb2877c26444 update(vaultwarden): bump version to 1.30.3

commit 8221014ea1472fa2a5d383a8a589fb2877c26444
Author: Jan Christian Grünhage <[email protected]>
Date:   Thu Feb 22 14:44:56 2024 +0100

    update(vaultwarden): bump version to 1.30.3

Rebase locally, and then force push to sammy/update-vaultwarden.

@CherryKitten CherryKitten force-pushed the sammy/update-vaultwarden branch from 38271e4 to c428a5e Compare August 12, 2024 08:40
@CherryKitten
Copy link
Member Author

/fast-forward

@github-actions github-actions bot merged commit c428a5e into main Aug 12, 2024
19 of 22 checks passed
@github-actions github-actions bot deleted the sammy/update-vaultwarden branch August 12, 2024 08:40
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.

2 participants