Laurent Destailleur 687e3d250b Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php

2015-03-13 17:46:31 +01:00

..

class

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

2015-02-26 13:36:07 +01:00

rapport

Fix: Miscellaneous fixes for multicompany

2014-12-06 14:41:56 +01:00

card.php

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

2015-02-28 03:11:15 +01:00

document.php

Fix divers

2014-11-07 23:07:15 +01:00

index.php

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

2015-03-11 03:55:46 +01:00

info.php

Fix: [ bug #1374 ] Salaries module requires "Special costs" module to

2014-05-10 18:57:04 +02:00

listactions.php

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00

peruser.php

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

2015-03-13 17:46:31 +01:00