Laurent Destailleur 5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/langs/es_ES/admin.lang

2013-01-05 16:41:08 +01:00

..

tpl

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

contact.php

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

2012-12-30 18:00:07 +01:00

dispatch.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

document.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

fiche.php

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

2013-01-05 16:41:08 +01:00

history.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

index.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

liste.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00

note.php

Fix: change for a neutral email

2012-12-30 15:13:49 +01:00