Maxime Kohlhaas 9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 ... Conflicts: htdocs/core/class/html.formfile.class.php		2013-07-14 13:27:41 +02:00
..
antivir.class.php
canvas.class.php
CMailFile.class.php
commondocgenerator.class.php
commoninvoice.class.php
commonobject.class.php
commonobjectline.class.php
commonorder.class.php
conf.class.php
cookie.class.php
cpays.class.php
CSMSFile.class.php
ctypent.class.php
discount.class.php
doleditor.class.php
dolexception.class.php
dolgeoip.class.php
dolgraph.class.php
dolprintipp.class.php
events.class.php
extrafields.class.php
fileupload.class.php
genericobject.class.php
google.class.php
hookmanager.class.php
html.form.class.php
html.formactions.class.php
html.formadmin.class.php
html.formbank.class.php
html.formbarcode.class.php
html.formcompany.class.php
html.formcontract.class.php
html.formcron.class.php
html.formfile.class.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862	2013-07-14 13:27:41 +02:00
html.formmail.class.php
html.formorder.class.php
html.formother.class.php
html.formprojet.class.php
html.formpropal.class.php
html.formsms.class.php
html.formsocialcontrib.class.php
index.php
infobox.class.php
interfaces.class.php
ldap.class.php
menu.class.php
menubase.class.php
notify.class.php
rssparser.class.php
smtps.class.php
stats.class.php
translate.class.php
vcard.class.php