Laurent Destailleur b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php

2015-10-16 10:12:36 +02:00

..

admin

[Qual] Replaced deprecated print_fiche_titre()

2015-09-24 18:34:58 +02:00

class

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

2015-10-16 10:12:36 +02:00

group

Optioncss not kept in list

2015-10-04 10:45:57 +02:00

agenda_extsites.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

card.php

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

2015-10-16 10:12:36 +02:00

clicktodial.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

document.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

hierarchy.php

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

2015-10-16 10:12:36 +02:00

home.php

[Qual] Replaced deprecated print_fiche_titre()

2015-09-24 18:34:58 +02:00

index.php

Optioncss

2015-10-04 13:34:55 +02:00

info.php

The new banner tab is also on user card now

2015-10-11 15:21:21 +02:00

ldap.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

logout.php

Fix: missing global declarations

2014-08-20 19:03:58 +02:00

note.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

param_ihm.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00

passwordforgotten.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

perms.php

Merge branch 'develop' into doactions-usercard

2015-10-13 09:49:19 +02:00