Laurent Destailleur 6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	.travis.yml

2013-09-11 23:12:47 +02:00

..

index.htm

…

jsgantt_exExternalXML.html

…

jsgantt_Minutes.html

…

jsgantt.css

…

jsgantt.js

…

jsgantt.min.js

Fix: Use correct standard

2013-09-11 23:07:47 +02:00

project.xml

…