Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Merge develop into experimental #2395

Merged
merged 2 commits into from
Jan 3, 2019
Merged

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jan 3, 2019

Minus #2336 which I'll migrate over separately (it's now in a different file and the impl should probably be mask-based rather than tint-based).

dbkr added 2 commits January 3, 2019 15:02
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
@dbkr dbkr requested a review from a team January 3, 2019 18:09
@jryans jryans self-assigned this Jan 3, 2019
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Thanks for working on this! 😁 It all looks good to me. I focused on the conflicted files you mentioned, but also quickly skimmed the remaining changes as well.

@jryans jryans assigned dbkr and unassigned jryans Jan 3, 2019
@dbkr dbkr merged commit ad47144 into experimental Jan 3, 2019
turt2live pushed a commit that referenced this pull request Jan 3, 2019
@t3chguy t3chguy deleted the dbkr/merge_develop_experimental branch June 29, 2019 05:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants