Skip to content

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Aug 30, 2021

Shares history with #4255, merge #4255 first!

Part 1: #4255
Part 2: #4378 (this pull request)
Part 3: #4379

@github-actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the darwinqol_2 branch 4 times, most recently from 1af7c81 to f0978c1 Compare September 1, 2021 17:32
@github-actions
Copy link

github-actions bot commented Sep 1, 2021

This pull request has conflicts, please rebase.

@github-actions
Copy link

github-actions bot commented Sep 2, 2021

This pull request has conflicts, please rebase.

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's drop 25a4330 and patch 19240 instead UdjinM6@30ad681 (also, why it's "force-merge"?)

@UdjinM6 UdjinM6 added this to the 18 milestone Sep 3, 2021
UdjinM6
UdjinM6 previously approved these changes Sep 3, 2021
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one minor thing

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for merging via merge commit

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 7a8ceb7 into dashpay:develop Sep 3, 2021
@kwvg kwvg deleted the darwinqol_2 branch July 18, 2023 11: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.

3 participants