Björn Weström 9f970ed953 Merge branch 'master' into text-labels ...

Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/flowchart/flowRenderer.js
	src/utils.js
	test/web_style.html

2015-01-13 21:50:05 +01:00

..

fixtures

Adds CLI tests

2014-12-20 17:40:58 -08:00

cli_test-output.js

Adds CLI tests

2014-12-20 17:40:58 -08:00

cli_test-parser.js

Adds CLI tests

2014-12-20 17:40:58 -08:00

seq.css

Html file for testing sequence diagrams

2015-01-05 13:26:15 +01:00

seq.html

Added the option to disable auto rendering via the mermaid namespace as described in issue #91

2015-01-06 19:33:00 +01:00

test-main.js

Support for åäö and minus in text

2014-11-12 07:35:44 +01:00

web_style_dagre.html

Additional tests for labels

2015-01-11 16:17:02 +01:00

web_style_html_label.html

Additional tests for labels

2015-01-11 16:17:02 +01:00

web_style.html

Added edge labels

2015-01-11 16:16:50 +01:00

web_style.svg

Added edge labels

2015-01-11 16:16:50 +01:00

web.html

New release

2015-01-11 15:02:35 +01:00