Fix: Image was not correctly generated. Bad licence into it.
Fix: Image was not correctly generated. Bad licence into it.
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Merge remote-tracking branch 'origin/3.3' into 3.4
Fix: wash file
Fix: watch file for debian package.
Merge remote-tracking branch 'origin/3.3' into 3.4
Fix: debian files
Fix debian package
Prepare for 3.4.1

Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
Fix: missing ;
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Merge remote-tracking branch 'origin/3.3' into 3.4
Merge pull request #1211 from FHenry/3.4

Fix: Delete linked element to supplier invoice when deleted (as done for
Fix: Edit propal line was losing product supplier price id
Fix: Edit propal line was losing product supplier price id

Conflicts:
	ChangeLog
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Conflicts:
	ChangeLog
Enabled travis-ci on old branch
Enabled travis-ci on old branch
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4