mirror of
https://github.com/Dolibarr/dolibarr
synced 2024-11-23 05:50:15 +00:00
824b572bd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
29 lines
473 B
Plaintext
29 lines
473 B
Plaintext
htdocs/conf/conf.php
|
|
htdocs/conf/conf.php.old
|
|
documents/
|
|
custom2/
|
|
test/report/
|
|
nbproject
|
|
default.properties
|
|
.settings/
|
|
.buildpath
|
|
.gitmodules
|
|
dolibarr_install.log
|
|
upgrade.log
|
|
doxygen_warnings.log
|
|
/.project
|
|
/.vscode
|
|
.DS_Store
|
|
.idea
|
|
*.iml
|
|
Thumbs.db
|
|
# Vagrant generated files
|
|
.vagrant
|
|
# Composer installed repositories
|
|
/htdocs/includes/**/.git
|
|
# Composer autoloader and unwanted files
|
|
htdocs/includes/autoload.php
|
|
htdocs/includes/bin/
|
|
htdocs/includes/composer/
|
|
/.pydevproject
|