Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 2 #2

Merged
merged 41 commits into from
Jun 19, 2020
Merged

Patch 2 #2

merged 41 commits into from
Jun 19, 2020

Conversation

stephen304
Copy link

Fix merge conflict

merklegroot and others added 30 commits June 15, 2020 11:55
Add folder structure to organize designs
Maybe you can see a paralel to something else, though I found it inappropriate to point it out.
@Ferferite Ferferite merged commit 083d1f9 into Ferferite:master Jun 19, 2020
@stephen304 stephen304 deleted the patch-2 branch June 19, 2020 20:23
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.

5 participants