Laurent Destailleur e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php

2019-02-14 15:33:17 +01:00

..

edit.php

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

2019-02-14 15:33:17 +01:00

index.php

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

2019-02-14 15:33:17 +01:00

other.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00