Eric a94211d3d3 Merge remote-tracking branch 'origin/develop' into feature/b931 ...

# Conflicts:
#	.idea/inspectionProfiles/Combodo.xml
#	application/cmdbabstract.class.inc.php
#	core/attributedef.class.inc.php
#	css/light-grey.css
#	css/light-grey.scss

2018-09-25 12:03:44 +02:00

..

codeStyles

Code cleanup

2018-09-24 13:57:45 +02:00

inspectionProfiles

Code cleanup

2018-09-24 13:57:45 +02:00

encodings.xml

Add shared idea file

2018-08-30 11:05:27 +02:00