dolibarr/htdocs/salaries
Laurent Destailleur 38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
..
admin Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
class Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
stats Fix stats page 2019-12-22 16:23:52 +01:00
card.php Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-04 14:20:25 +01:00
document.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
info.php replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
list.php