Merge remote-tracking branch 'remotes/origin/master' into story68

8 years ago · 0ff4e9871d
parent dc9317fe2e eebdd3806e
commit 0ff4e9871d
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -92,6 +92,7 @@ nbactions.xml
 .idea/misc.xml
 .idea/compiler.xml
 .idea/modules.xml
+.idea/codeStyleSettings.xml

 # Sensitive or high-churn files:
 .idea/dataSources.ids