Skip to content

Commit d5be9a8

Browse files
infeoinfeo
committed
Merge branch 'develop' into release/2.1.0
2 parents 766b562 + e32836d commit d5be9a8

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)