Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/mermaid.js
2025-09-23 09:20:03 +02:00 · 2016-03-12 11:24:22 +01:00
parent 2c90034d39 6c621f243d
commit 325d0dd075
17 changed files with 6732 additions and 4219 deletions
--- a/test/examples/leadingComments.html
+++ b/test/examples/leadingComments.html
@@ -22,7 +22,7 @@
            B                          -->C["#9829; ;^; #60;"]
        </div>
        <div class="mermaid" id="i211">
-
+            %% Example diagram
            sequenceDiagram
            Ali#45;ce->>John: Hello John, how are you? #60;
            John-->>Alice: Great!#quot;