Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/gantt/ganttRenderer.js
	test/gantt.html
This commit is contained in:
knsv
2015-05-09 19:18:12 +02:00
11 changed files with 92 additions and 193 deletions

View File

@@ -4,6 +4,7 @@
.mermaid .label {
color: #333333;
}
.node rect,
.node circle,
.node polygon {