Skip to content
Snippets Groups Projects

Merge branch 'master' in main

Merged Merge branch 'master' in main
github/fork/madppiper/main into main
Merged Administrator requested to merge github/fork/madppiper/main into main

Created by: madppiper

@vdavid third time's a charm?

I ended up redoing the merge - manually updated conflicts. I used your master branch, so at least you won't have to remerge your master branch after this...

Test plan

None

Merge request reports

Approval is optional

Merged by avatar (Jun 5, 2025 3:00pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator
    Administrator @root
    Author Owner

    Created by: philipp-spiess

    Review: Approved

    This is amazing! Thank you so much for fixing this :-) Let's see if the tests pass and then I'll merge it.

    And +1 on deleting master afterwards.

  • Administrator
    Administrator @root
    Author Owner

    Merged by: vdavid at 2022-04-21 11:57:15 UTC

Please register or sign in to reply