AI-223.8836.35.2231.9848316 <debuggerx@debuggerx-e5 Merge branch 'master'

Conflicts:
	yiiguxing.translation.xml
master
DebuggerX 2 years ago
commit 7ba4474f59

@ -1,5 +1,5 @@
<application> <application>
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" starredTemplates="" unignoreActions="true" notifyIgnoredEditing="true" foldableProjectViewAdvertisePresented="true"> <component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" starredTemplates="" unignoreActions="true" notifyIgnoredEditing="true" foldableProjectViewAdvertiseShown="true">
<languages> <languages>
<language id="Bazaar" NEW_FILE="true" ENABLE="true" /> <language id="Bazaar" NEW_FILE="true" ENABLE="true" />
<language id="CloudFoundry" NEW_FILE="true" ENABLE="false" /> <language id="CloudFoundry" NEW_FILE="true" ENABLE="false" />

Loading…
Cancel
Save