Laurent Destailleur af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php

2013-06-25 23:22:00 +02:00

..

action

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

admin

- New: [ task #926 ] Add extrafield feature on order lines

2013-06-10 16:05:41 +02:00

mailing

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

propal

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

prospect

Qual: Removed useless methods

2013-06-16 21:31:21 +02:00

address.php

Look: Start to use div to render actions buttons

2013-04-03 18:37:54 +02:00

bookmark.php

standardize code

2013-06-20 09:18:12 +02:00

contact.php

standardize code

2013-06-20 09:18:12 +02:00

fiche.php

standardize code

2013-06-20 09:18:12 +02:00

index.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

list.php

standardize code

2013-06-20 09:18:12 +02:00

multiprix.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

propal.php

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

2013-06-25 23:22:00 +02:00

recap-client.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

remise.php

Qual: Removed useless methods

2013-06-16 21:31:21 +02:00

remx.php

standardize code

2013-06-20 09:18:12 +02:00