CLion CL-140.569.17 <riad@riad-osx1.local Update RiaD.xml
Merge branch 'master'
CLion CL-140.569.17 <riad@riad-osx1.local Update other.xml, editor.codeinsight.xml, notifications.xml, filetypes.xml, ide.general.xml, customization.xml	Delete __deleted.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$ROOT_CONFIG$/codestyles/RiaD.xml