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

Conflicts:
	.travis.yml
This commit is contained in:
Laurent Destailleur 2013-09-09 17:16:24 +02:00
commit 104d394128

View File

@ -23,6 +23,7 @@ Fix: Intervention box links to contracts id
Fix: Compatiblity with multicompany module
Fix: Edit propal line was losing product supplier price id
Fix: Delete linked element to supplier invoice when deleted
Qual: Add travis-ci integration
***** ChangeLog for 3.4 compared to 3.3.* *****
For users: