Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yann Cébron
2017-01-10 18:52:24 +01:00
2 changed files with 2 additions and 1 deletions
@@ -946,3 +946,4 @@ WebStorm.JavaScript.Modules.Diagram.description=Turns on module dependency diagr
editable.java.test.console=true
editable.java.test.console.description=Enables System.in in java test consoles (junit & testng)
swift.create.type.from.usage.enabled=false
@@ -1,5 +1,5 @@
<component>
<version major="3" minor="5" eap="true"/>
<version major="3" minor="5" eap="false"/>
<company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<logo url="/pycharm_edu_logo.png" textcolor="313131" progressColor="20d688" progressY="281" progressTailIcon="/community_progress_tail.png"/>