del empty file
del empty file
del empty file
phpcsci
phpcsci
phpcs-ci
phpcs-ci
phpcs-ci
phpcs-ci
phpcs-ci
Merge branch 'dev-master' into staging
phpcs-ci
phpcs-ci
#413 schema
Merge branch 'phpcs' into crm

Conflicts:
	.gitignore
	src/Lists/OrganizationBundle/Validator/UniqueEdrpouValidator.php
Merge branch 'phpcs' into crm

Conflicts:
	.gitignore
	src/Lists/OrganizationBundle/Validator/UniqueEdrpouValidator.php
Delete no php file
Merge branch 'phpcs' into crm
#413, #426
#413, #426