Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php

popup

More information on project list of thirdparty.

Conflicts:
	htdocs/core/lib/files.lib.php

Conflicts:
	htdocs/core/lib/files.lib.php

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php