dolibarr/htdocs/theme
Laurent Destailleur 1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
..
common Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
eldy CSS 2020-02-05 14:04:19 +01:00
md CSS 2020-02-05 14:04:19 +01:00
.gitignore
dolibarr_logo_256x256.png Update logos 2020-01-24 17:30:46 +01:00
dolibarr_logo_bw.png Update logos 2020-01-24 17:30:46 +01:00
dolibarr_logo_squarred_alpha.png Use alpha logo by default 2019-10-15 11:41:22 +02:00
dolibarr_logo_squarred.png Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED, 2019-09-16 15:26:13 +02:00
dolibarr_logo.png NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png
dolibarr.png
dolistore_logo.png
index.html