lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9589f69574
dolibarr/htdocs
History
Regis Houssin 9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
..
accountancy FIX change my deprecated email 2018-10-27 14:43:12 +02:00
adherents Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
admin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
api FIX change my deprecated email 2018-10-27 14:43:12 +02:00
asset Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
asterisk
barcode
blockedlog Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
bookmarks Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
cashdesk FIX change my deprecated email 2018-10-27 14:43:12 +02:00
categories FIX change my deprecated email 2018-10-27 14:43:12 +02:00
collab
comm FIX change my deprecated email 2018-10-27 14:43:12 +02:00
commande Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
compta Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
conf
contact FIX change my deprecated email 2018-10-27 14:43:12 +02:00
contrat Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
core Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
cron FIX change my deprecated email 2018-10-27 14:43:12 +02:00
custom
datapolicy Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
dav
don FIX change my deprecated email 2018-10-27 14:43:12 +02:00
ecm FIX change my deprecated email 2018-10-27 14:43:12 +02:00
emailcollector Prepare module 2018-10-29 11:21:57 +01:00
expedition FIX change my deprecated email 2018-10-27 14:43:12 +02:00
expensereport Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
exports FIX change my deprecated email 2018-10-27 14:43:12 +02:00
externalsite
fichinter Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
fourn Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
ftp FIX change my deprecated email 2018-10-27 14:43:12 +02:00
holiday FIX change my deprecated email 2018-10-27 14:43:12 +02:00
hrm FIX change my deprecated email 2018-10-27 14:43:12 +02:00
imports FIX change my deprecated email 2018-10-27 14:43:12 +02:00
includes Merge pull request #9841 from laudeco/fix/9824_pdf_merge 2018-10-24 02:31:48 +02:00
install Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
langs Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:47:39 +01:00
livraison FIX change my deprecated email 2018-10-27 14:43:12 +02:00
loan Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
mailmanspip FIX change my deprecated email 2018-10-27 14:43:12 +02:00
margin Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
modulebuilder Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
multicurrency/class
opensurvey FIX change my deprecated email 2018-10-27 14:43:12 +02:00
paybox FIX change my deprecated email 2018-10-27 14:43:12 +02:00
paypal FIX change my deprecated email 2018-10-27 14:43:12 +02:00
printing Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
product Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
projet Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
public FIX change my deprecated email 2018-10-27 14:43:12 +02:00
resource Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
societe FIX change my deprecated email 2018-10-27 14:43:12 +02:00
stripe FIX change my deprecated email 2018-10-27 14:43:12 +02:00
supplier_proposal FIX change my deprecated email 2018-10-27 14:43:12 +02:00
support Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
takepos FIX change my deprecated email 2018-10-27 14:43:12 +02:00
theme FIX change my deprecated email 2018-10-27 14:43:12 +02:00
ticket FIX change my deprecated email 2018-10-27 14:43:12 +02:00
user FIX change my deprecated email 2018-10-27 14:43:12 +02:00
variants Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
webservices FIX change my deprecated email 2018-10-27 14:43:12 +02:00
website Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
.gitignore
cache.manifest FIX remove deprecated and unused file 2018-10-27 14:26:23 +02:00
document.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
favicon.ico
filefunc.inc.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
index.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
main.inc.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
master.inc.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
robots.txt
viewimage.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00