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

chore: merge develop into main #20

Merged
merged 40 commits into from
Aug 31, 2022
Merged

chore: merge develop into main #20

merged 40 commits into from
Aug 31, 2022

Conversation

MarkusJx
Copy link
Owner

No description provided.

MarkusJx and others added 30 commits August 12, 2022 20:10
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
# Conflicts:
#	npm/darwin-arm64/README.md
#	npm/darwin-arm64/package.json
#	npm/darwin-x64/README.md
#	npm/darwin-x64/package.json
#	npm/linux-x64-gnu/README.md
#	npm/linux-x64-gnu/package.json
#	npm/win32-ia32-msvc/README.md
#	npm/win32-ia32-msvc/package.json
#	npm/win32-x64-msvc/README.md
#	npm/win32-x64-msvc/package.json
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
# Conflicts:
#	package-lock.json
#	package.json
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
MarkusJx and others added 8 commits August 31, 2022 16:56
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
# Conflicts:
#	package-lock.json
#	package.json
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
# Conflicts:
#	package-lock.json
#	package.json
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
@MarkusJx MarkusJx self-assigned this Aug 31, 2022
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
Signed-off-by: Markus <28785953+MarkusJx@users.noreply.github.com>
@MarkusJx MarkusJx merged commit 023b31a into main Aug 31, 2022
@MarkusJx MarkusJx deleted the develop branch August 31, 2022 20:31
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.

None yet

2 participants