Skip to content
Snippets Groups Projects
Commit 9acf60d7 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.5' into 3.6 

Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
parents 2ac088d6 32a6d59b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 25 additions and 23 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment