Merge branch 'hotfix/6.7.1'

ccomeaux · Nov 20, 2019 · 4fc19cb · 4fc19cb
2 parents bad6109 + 27cefaa
commit 4fc19cb
Show file tree

Hide file tree

Showing 6 changed files with 497 additions and 67 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml