Skip to content
Snippets Groups Projects
Commit e97078f6 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 

into develop

Conflicts:
	htdocs/contact/class/contact.class.php
	test/phpunit/ContactTest.php
	test/phpunit/SocieteTest.php
parents 55156edd 4bf03a2d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
test/phpunit/ContactTest.php
+ 1
− 1
View file @ e97078f6
test/phpunit/SocieteTest.php
+ 1
− 1
View file @ e97078f6
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment