.travis.yml · 1dcbf4c39b6609cfb3f582977ff0728e66bda7a3 · Software_Artifact_Infrastructure_Repository / dolibarr

10 years ago

Merge remote-tracking branch 'origin/3.7' into develop · a55af438

Laurent Destailleur authored 10 years ago

Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php

a55af438

History

Merge remote-tracking branch 'origin/3.7' into develop

Laurent Destailleur authored 10 years ago

Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php