dolibarr/htdocs/categories
Laurent Destailleur 9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
..
admin Fix opacity on text with a href links inside 2019-12-22 13:19:14 +01:00
class doxygen todo 2019-12-11 19:11:13 +01:00
card.php Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
edit.php Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
index.php Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
photos.php Update photos.php 2019-11-25 23:57:10 +01:00
traduction.php Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 14:13:26 +01:00
viewcat.php Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00