2
0
forked from Wavyzz/dolibarr
Commit Graph

5 Commits

Author SHA1 Message Date
Laurent Destailleur
39a7271f91 Fix bad merge 2015-03-05 10:57:17 +01:00
Laurent Destailleur
09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr
into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php
2015-03-04 20:52:54 +01:00
Laurent Destailleur
7a9de0feca CRLF 2015-03-04 20:45:33 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00