Skip to content

Merge Master to dev with major reorg#175

Merged
daobrien merged 7 commits intodevfrom
master
May 20, 2020
Merged

Merge Master to dev with major reorg#175
daobrien merged 7 commits intodevfrom
master

Conversation

@daobrien
Copy link
Copy Markdown
Collaborator

No description provided.

daobrien added 7 commits May 8, 2020 15:10
This reverts commit a354d22, reversing
changes made to 3684d86.
This file will move to the root dir where it belongs.
Lots of updates in master to clean up a mess and need to make dev agree
with it.
@daobrien daobrien merged commit a14c6d8 into dev May 20, 2020
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.

1 participant