Skip to content

Master2dev 484#504

Merged
einola merged 4 commits intodevelopfrom
master2dev-484
Jan 21, 2021
Merged

Master2dev 484#504
einola merged 4 commits intodevelopfrom
master2dev-484

Conversation

@tdcwilliams
Copy link
Copy Markdown
Contributor

not sure why this one is necessary, but master was 3 commits ahead of develop for some reason...
Did a couple of stylistic changes while I was resolving some conflicts

@einola einola merged commit f957c1e into develop Jan 21, 2021
@einola einola deleted the master2dev-484 branch January 21, 2021 05:52
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