WS-2017.3.5 <martin@martins-imac-2.local Merge branch 'master'

Conflicts:
	colors/Monokai copy.icls
This commit is contained in:
Martin Donnelly 2018-03-26 08:22:03 +01:00
commit 21990c28e9

View File

@ -4,7 +4,7 @@
<property name="created">2017-04-04T13:51:10</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2017.1.0.0</property>
<property name="modified">2018-03-25T11:59:58</property>
<property name="modified">2018-03-25T11:59:14</property>
<property name="originalScheme">_@user_Monokai</property>
</metaInfo>
<option name="EDITOR_FONT_SIZE" value="12" />