Laurent Destailleur
|
29e6d01e51
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
|
2013-01-13 19:33:54 +01:00 |
|
Regis Houssin
|
54860ef304
|
Fix: upgrade tcpdf and fpdi
|
2012-08-29 09:55:32 +02:00 |
|
Raphaël Doursenaud
|
d34c4518d2
|
Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)
Conflicts:
htdocs/core/filemanagerdol/browser/default/js/common.js
htdocs/core/filemanagerdol/browser/default/js/fckxml.js
|
2012-07-28 19:04:50 +02:00 |
|
Laurent Destailleur
|
a498525dda
|
Removed completely fpdf. Keep only fpdi
|
2011-08-11 15:43:52 +00:00 |
|