dolibarr/htdocs
Laurent Destailleur af9e2d07d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/paiement.php
	htdocs/fourn/facture/paiement.php
2019-02-03 20:38:47 +01:00
..
accountancy Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
adherents Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
admin Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
api Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
asset Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
asterisk PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
barcode PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
blockedlog Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
bookmarks clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
cashdesk Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
categories Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
collab PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
comm Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
commande Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
compta Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2019-02-03 20:38:47 +01:00
conf test include 2018-07-26 17:30:53 +02:00
contact clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
contrat Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
core Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
cron Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
custom
datapolicy Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
dav Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
don Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
ecm Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
emailcollector Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
expedition Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
expensereport Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
exports Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
externalsite Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
fichinter clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
fourn Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2019-02-03 20:38:47 +01:00
ftp Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
holiday Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
hrm Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
imports Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
includes NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
install Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
langs CSS improvements and Takepos setup check 2019-02-02 23:57:38 +01:00
livraison Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
loan Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
mailmanspip Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
margin Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
modulebuilder Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
multicurrency/class Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
opensurvey Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
paybox Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
paypal Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
printing PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
product Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
projet Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
public Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
reception Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
resource Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
societe Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
stripe wip 2019-01-30 22:53:47 +01:00
supplier_proposal Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
support Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
takepos Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
theme Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
ticket Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
user Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
variants Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
webservices Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
website Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
.gitignore Ignore 2018-11-18 15:57:20 +01:00
cache.manifest FIX remove deprecated and unused file 2018-10-27 14:26:23 +02:00
document.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
favicon.ico
filefunc.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
index.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
main.inc.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
master.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
robots.txt
viewimage.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00