Laurent Destailleur 634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/core/lib/functions.lib.php

2014-12-07 19:19:48 +01:00

..

canvas

Fixed: Translations

2014-12-07 18:24:45 +01:00

class

Fix: Param $action was not defined.

2014-11-15 19:04:21 +01:00

card.php

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

2014-12-07 19:19:48 +01:00

exportimport.php

Fixed: Translations

2014-12-07 18:24:45 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

info.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-09-13 19:10:05 +02:00

ldap.php

Fixed: Translations

2014-12-07 18:24:45 +01:00

list.php

Fixed: Translations

2014-12-07 18:24:45 +01:00

note.php

Fixed: Translations

2014-12-07 18:24:45 +01:00

perso.php

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

2014-12-07 19:19:48 +01:00

vcard.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00