Commit Graph

4 Commits

Author SHA1 Message Date
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00