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

Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php

2013-06-24 20:02:02 +02:00

..

admin

New: Switch cron module to status stable. Thanks to everybody to test

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

class

Qual: No need to use two menu entries for this.

2013-04-17 16:26:14 +02:00

card.php

Fix: convert lines delimiters

2013-06-24 17:36:33 +02:00

info.php

Fix: Fix error with linux rules

2013-04-30 21:31:35 +02:00

list.php

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

2013-06-24 20:02:02 +02:00