lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e496823778
dolibarr/htdocs
History
Laurent Destailleur e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
..
accountancy Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
adherents Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
admin Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
asterisk Removed closing php tag 2014-05-03 18:18:44 +02:00
barcode More substitutions 2014-06-12 11:31:53 +02:00
bookmarks More substitutions 2014-06-12 11:31:53 +02:00
boutique Align size for accounting account & Drop old table & Typo 2014-06-29 07:57:42 +02:00
cashdesk Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
categories Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
comm Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 13:45:07 +02:00
commande Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
compta Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
conf
contact Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
contrat Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
core Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
cron Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
ecm Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
expedition Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
exports Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
externalsite Removed closing php tag 2014-05-03 18:18:44 +02:00
fichinter Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
fourn Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
ftp More substitutions 2014-06-12 11:31:53 +02:00
holiday Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
imports Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
includes Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
install Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
langs Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
livraison Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
mailmanspip/class Removed closing php tag 2014-05-03 18:18:44 +02:00
margin Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
opensurvey Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
paybox Removed closing php tag 2014-05-03 18:18:44 +02:00
paypal Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
printipp Removed closing php tag 2014-05-03 18:18:44 +02:00
product Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
projet Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
public Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
resource Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
societe Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 2014-07-04 13:43:50 +02:00
support Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
theme New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
user Merge remote-tracking branch 'origin/3.6' into develop 2014-07-04 14:14:40 +02:00
webservices Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
index.php Removed closing php tag 2014-05-03 18:18:44 +02:00
main.inc.php avoid message 2014-07-04 13:16:48 +02:00
master.inc.php Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
robots.txt
viewimage.php