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
..
ckeditor	Fix: Readonly mode for email was ok for eldy only.	2013-06-03 20:16:07 +02:00
img	Fix: Minor fixes into style.	2013-06-05 14:23:49 +02:00
tpl	Removed deprecated and not working code.	2013-04-09 01:29:29 +02:00
AUTHOR	Modification auteur	2011-08-17 15:46:12 +00:00
graph-color.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
index.php	Fix: Avoid errors into rpm packages	2011-07-31 21:24:20 +00:00
style.css.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-24 20:02:02 +02:00
thumb.png	*** empty log message ***	2011-08-17 16:24:06 +00:00