Skip to content

Commit 1cbc660

Browse files
committed
Merge branch 'develop' into release/2.0.0
2 parents 6445f1d + e32836d commit 1cbc660

File tree

2 files changed

+83
-0
lines changed

2 files changed

+83
-0
lines changed

.idea/codeStyles/Project.xml

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)