Laurent Destailleur 01aad8516d Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php

2015-05-31 03:30:38 +02:00

..

admin.lang

Sync transifex

2015-04-22 14:58:06 +02:00

banks.lang

Sync from transifex

2015-04-02 13:56:32 +02:00

bills.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

categories.lang

Sync language files

2015-05-31 03:07:17 +02:00

interventions.lang

Sync transifex

2015-04-22 14:58:06 +02:00

mails.lang

Sync translation

2015-05-03 15:37:15 +02:00

main.lang

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

2015-04-22 17:57:57 +02:00

orders.lang

Sync transifex

2015-04-22 14:58:06 +02:00

productbatch.lang

Sync transifex

2015-04-22 14:58:06 +02:00

sendings.lang

Sync language files

2015-05-31 03:07:17 +02:00

stocks.lang

Sync transifex

2015-04-22 14:58:06 +02:00