Commit Graph

823 Commits

Author SHA1 Message Date
Neil Cuzon 9fd97d89c0
Update usage.md 2020-11-07 23:41:58 -08:00
Neil Cuzon 0544f96980
Update README.md 2020-11-07 21:28:33 -08:00
Neil Cuzon 4671a49fd8
Update _sidebar.md 2020-11-07 21:24:38 -08:00
Knut Sveidqvist e3cf8b7843 Updated version oif mermaid in the docs 2020-11-05 20:09:08 +01:00
Knut Sveidqvist 997257ff79 Merge branch 'release/8.8.3'
Conflicts:
	docs/diagrams-and-syntax-and-examples/flowchart.md
	docs/flowchart.md
2020-11-05 20:08:18 +01:00
Ashish Jain 153da33311 Updating minor changes on Docs 2020-11-05 19:29:29 +01:00
Knut Sveidqvist 93f613d6af Merge branch 'release/8.8.3' of github.com:mermaid-js/mermaid into release/8.8.3 2020-11-05 19:23:41 +01:00
Knut Sveidqvist 608c0df0f7 Updated docs 2020-11-05 19:23:38 +01:00
Ashish Jain 4f568d5d19 Updating minor changes on Docs 2020-11-05 19:16:12 +01:00
Knut Sveidqvist 68410b9c58 Merge branch 'release/8.8.3' into develop 2020-11-04 20:33:25 +01:00
Knut Sveidqvist 7a3ecb339b Updated the docs, updated the sections and fixed some bad links 2020-11-04 20:28:10 +01:00
Knut Sveidqvist 144cba7f10
Merge pull request #1755 from loris-intergalactique/develop
Fixed spelling errors
2020-11-04 19:24:50 +01:00
LORIS INTERGALACTIQUE 47a3ca44ba
Add scss path in docs 2020-11-04 16:59:28 +01:00
LORIS INTERGALACTIQUE 0e7ad3feeb
Removed an incomplete line 2020-11-04 16:56:12 +01:00
LORIS INTERGALACTIQUE bb6ba758db
Fixed spelling errors 2020-11-04 16:52:28 +01:00
Adrian Hall 1ce4805bdc Merge branch 'develop' into feature/1531_ERD_attributes 2020-11-02 09:44:56 +00:00
Adrian Hall ae1880311e Support attribute definitions for entities in ERDs 2020-11-02 09:41:46 +00:00
Knut Sveidqvist 855dec7fcd Fix for build 2020-11-01 11:08:47 +01:00
Knut Sveidqvist 6aaec3dc96 Merge branch 'bug/1710_underscore_in_entity_names' of https://github.com/spopida/mermaid into spopida-bug/1710_underscore_in_entity_names 2020-10-31 11:10:24 +01:00
Neil Cuzon 6363cb0d80
Update README.md 2020-10-30 18:14:10 -07:00
Neil Cuzon 17d9f4fb46
Update README.md 2020-10-30 18:11:35 -07:00
Neil Cuzon 2c6329310a
Update README.md 2020-10-30 18:09:31 -07:00
Neil Cuzon 48089e869e
Update README.md 2020-10-30 18:06:57 -07:00
Neil Cuzon 5cb735eb8f
Update README.md 2020-10-30 18:02:26 -07:00
Neil Cuzon d034e32703
Update README.md 2020-10-30 17:59:54 -07:00
Neil Cuzon bf2376d504
Update README.md 2020-10-30 17:58:34 -07:00
Neil Cuzon aba8c0356a
Update README.md 2020-10-30 17:57:36 -07:00
Adrian Hall 26e0283fc7 Merge remote-tracking branch 'origin/bug/1710_underscore_in_entity_names' into develop 2020-10-30 13:56:22 +00:00
Neil Cuzon 56fbbef133
Update stateDiagram.md 2020-10-28 01:10:39 -07:00
Neil Cuzon 6ece2537ee
Update usage.md 2020-10-28 01:10:34 -07:00
Neil Cuzon f7b722f10f
Update user-journey.md 2020-10-28 01:10:29 -07:00
Neil Cuzon 64544a6e7c
Update pie.md 2020-10-28 01:09:49 -07:00
Neil Cuzon 1ef7a097a6
Update integrations.md 2020-10-28 00:44:37 -07:00
Neil Cuzon b70297dc7a
Update n00b-gettingStarted.md 2020-10-28 00:44:34 -07:00
Neil Cuzon 732b3289f0
Update n00b-overview.md 2020-10-28 00:44:31 -07:00
Neil Cuzon bc0caa5dd6
Update n00b-syntaxReference.md 2020-10-28 00:44:29 -07:00
Neil Cuzon f835b34f57
Update newDiagram.md 2020-10-28 00:44:27 -07:00
Neil Cuzon 3aa33bd720
Update examples.md 2020-10-28 00:40:31 -07:00
Neil Cuzon 87601fba1b
Update faq.md 2020-10-28 00:40:29 -07:00
Neil Cuzon adc900a03a
Update flowchart.md 2020-10-28 00:40:25 -07:00
Neil Cuzon de52808e9f
Update gantt.md 2020-10-28 00:40:23 -07:00
Neil Cuzon 31aebca134
Update classDiagram.md 2020-10-28 00:38:21 -07:00
Neil Cuzon 9d09bdc1f3
Update development.md 2020-10-28 00:38:02 -07:00
Neil Cuzon a9c3019433
Update entityRelationshipDiagram.md 2020-10-28 00:37:35 -07:00
Neil Cuzon 3f56830170
Update directives.md 2020-10-28 00:37:33 -07:00
Neil Cuzon 73b1953c09
Update Tutorials.md 2020-10-28 00:20:35 -07:00
Neil Cuzon 4e0fc58f60
Update Tutorials.md 2020-10-28 00:20:20 -07:00
Neil Cuzon 108f102360
Update CHANGELOG.md 2020-10-28 00:19:36 -07:00
Neil Cuzon be73811c53
Update README.md 2020-10-28 00:18:12 -07:00
Neil Cuzon f3fbc004f3
Update 8.6.0_docs.md 2020-10-28 00:17:17 -07:00
Neil Cuzon be71cf5689
Update 8.6.0_docs.md 2020-10-28 00:16:40 -07:00
Neil Cuzon bd53fce4a7
Update 8.6.0_docs.md 2020-10-28 00:15:17 -07:00
NeilCuzon 445daaeba2 Switching to Docsify and adding search 2020-10-25 00:30:20 -07:00
Adrian Hall 245e25f4b7 Allow underscores in entity names, and entities with no relationships 2020-10-23 10:00:17 +01:00
Bastian Zimmermann cff55e91b0
Fixed bold 2020-10-22 15:41:36 +02:00
Bastian Zimmermann 005390f54b
Updated http to https 2020-10-22 15:36:52 +02:00
Bastian Zimmermann 82ce848d24
Pointed Live editor and CLI to new repo 2020-10-22 15:32:59 +02:00
Bastian Zimmermann dfdae7f046
Added space 2020-10-22 15:00:06 +02:00
Bastian Zimmermann 7a7bad2aa3
Added link to example 2020-10-22 14:59:31 +02:00
Bastian Zimmermann 8f438744cf
Added link to example 2020-10-22 14:58:58 +02:00
Bastian Zimmermann 460ccd9b34
Added link to example 2020-10-22 14:56:56 +02:00
Andreas Volkmann 4c239b7eef
Update flowchart.md 2020-10-16 12:34:08 +02:00
Andreas Volkmann ac8ddd58f0
Update flowchart.md
Fix typos
2020-10-16 12:31:05 +02:00
Neil Cuzon b435171aa2
Merge branch 'develop' into patch-1 2020-10-16 02:49:06 -07:00
Knut Sveidqvist 561ee5c72e
Merge pull request #1729 from Eraledm/fixing-broken-diagrams
Fixed empty code examples
2020-10-15 19:44:54 +02:00
Knut Sveidqvist 5e0f2e8572
Merge branch 'develop' into fix_links 2020-10-15 19:43:49 +02:00
Knut Sveidqvist 350732d8dd
Merge pull request #1705 from hwine/typo-pie.md
Fix typo in pie.md
2020-10-15 19:37:58 +02:00
Manuel DeLaRe 7dd82a4a87 Fixed empty code examples 2020-10-14 13:50:44 -05:00
Andreas Deininger 439399b9f1 Fixing various typos/misspellings in documentation 2020-10-14 14:41:15 +02:00
Andreas Deininger 5e95d75f44 Fixing broken links 2020-10-14 13:47:20 +02:00
Neil Cuzon 35deb4a512
Update n00b-overview.md 2020-10-09 18:49:45 -07:00
Neil Cuzon 19ac8e6e61
Update Tutorials.md 2020-10-09 02:14:01 -07:00
Neil Cuzon 68a0506a40
Update Tutorials.md 2020-10-08 18:46:02 -07:00
Knut Sveidqvist acc4f31c3a Merge branch 'release/8.8.2' 2020-10-08 19:45:50 +02:00
Neil Cuzon e9f4d2040b
Update _sidebar.md 2020-10-05 19:56:32 -07:00
Neil Cuzon 6d58836301
Update _sidebar.md 2020-10-05 19:37:36 -07:00
Neil Cuzon c81eaccfef
Update newDiagram.md 2020-10-05 19:03:45 -07:00
Hal Wine b21100cc5d
Fix typo in pie.md
':' is called a "[colon](https://en.wikipedia.org/wiki/Colon_(punctuation))" (not [semi-colon](https://en.wikipedia.org/wiki/Semicolon))
2020-10-03 09:07:32 -07:00
Neil Cuzon f6954c898d
Update README.md 2020-10-01 18:53:48 -07:00
Neil Cuzon f1cea37814
Update README.md 2020-10-01 18:53:30 -07:00
Roy Zheng 911d97c0a3
Fix broken links in gantt.md 2020-10-01 16:01:53 -07:00
Neil Cuzon abba5a5d75
Update newDiagram.md 2020-09-20 07:06:57 -07:00
Neil Cuzon 98b556cb1a
Update development.md 2020-09-20 06:25:57 -07:00
Neil Cuzon 488afd64d7
Create newDiagram.md 2020-09-20 06:09:37 -07:00
Neil Cuzon e2a7e60dad
Update _sidebar.md 2020-09-20 06:08:19 -07:00
David Wittman 77d57b865d
Fix typo in n00b-syntaxReference.md 2020-09-17 15:38:44 -05:00
Knut Sveidqvist b795950892 #1636 Manual update due to conflicts 2020-09-09 18:56:40 +02:00
Neil Cuzon bbec2c54ed Adding a reference to mermaid.min.js
Forces Docs to adopt new syntax modifications, allowing graphs made in the newer syntax to be parsed and rendered in GitHub Pages.
2020-09-07 19:51:23 +02:00
saowang 1f4be42b3f Fixed broken links and syntax in the document 2020-09-07 14:02:09 +08:00
Neil Cuzon 6a1c88204a
Adding a reference to mermaid.min.js
Forces Docs to adopt new syntax modifications, allowing graphs made in the newer syntax to be parsed and rendered in GitHub Pages.
2020-09-06 18:16:03 -07:00
Knut Sveidqvist 89f616df88 Test commit 2020-09-06 09:18:09 +02:00
saowang d003f9c6fd Update auto generated Setup.md with front matter 2020-08-26 01:38:51 +08:00
Neil Cuzon 78a8ae3ba2
Merge pull request #1633 from Mogztter/doc/changelog
Merge changelog and Mermaid Versions
2020-08-25 03:27:58 -07:00
Yash Singh c0008bf850
Made Capitalization Changes 2020-08-23 13:47:45 -07:00
GDFaber 3b026ff0cc
Merge pull request #1641 from andrewschleifer/patch-1
fix: typo
2020-08-23 20:41:21 +02:00
Knut Sveidqvist 55f0d0ab9f Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-08-23 20:02:55 +02:00
Knut Sveidqvist 0cbd002667 #1607 Using correct config when to decide about sanitizing text 2020-08-23 20:02:51 +02:00
Andrew Schleifer 5246f81dce
fix: typo 2020-08-24 00:56:12 +08:00
Guillaume Grossetie ab130900a1 Merge changelog and Mermaid versions 2020-08-23 15:08:25 +02:00
Neil Cuzon d4b72ececc
Delete _sidebar.md 2020-08-23 03:35:36 -07:00
Neil Cuzon 41b8ac32b3
Delete CHANGELOG.md 2020-08-23 03:35:22 -07:00
Neil Cuzon 7e0e4455b0
Create _sidebar.md 2020-08-23 02:47:29 -07:00
Neil Cuzon 2127c00671
Create CHANGELOG.md 2020-08-23 02:46:55 -07:00
Neil Cuzon 874fc741b5
Update README.md 2020-08-23 02:44:16 -07:00
Neil Cuzon 605241f6e1
Update _sidebar.md 2020-08-22 16:26:02 -07:00
Neil Cuzon dac7b1c5b1
Delete Tutorials.md 2020-08-21 18:42:39 -07:00
Neil Cuzon 9440b09c66
Create Tutorials.md 2020-08-21 18:41:57 -07:00
Neil Cuzon 6da0ceec9d
Update _sidebar.md 2020-08-21 17:13:34 -07:00
Neil Cuzon bcb388ea9e
Merge pull request #1634 from saowang/develop
Change docs theme from docsify to jekyll-rtd-theme
2020-08-21 17:11:59 -07:00
Neil Cuzon 288f1320a1
Delete _sidebar.md 2020-08-21 17:11:24 -07:00
Neil Cuzon 4aa461e317
Update _sidebar.md 2020-08-21 02:02:35 -07:00
Neil Cuzon 54674158ca
Update Tutorials.md 2020-08-21 01:36:08 -07:00
Neil Cuzon b02a884c16
Update Tutorials.md 2020-08-21 01:17:50 -07:00
Neil Cuzon 91f0f21f45
Create Tutorials.md 2020-08-21 01:16:33 -07:00
saowang 95bcd14c1d
Update README.md 2020-08-21 14:30:42 +08:00
saowang 9e8c6aed4d Update documents to compatible jekyll-rtd-theme 2020-08-21 01:01:06 +08:00
saowang f63b58edd9 Docs use remote_theme 2020-08-20 23:03:22 +08:00
saowang ea47873db3 Add jekyll ignore files 2020-08-20 22:59:18 +08:00
saowang a608f98ca5 Add jekyll-rtd-theme 2020-08-20 22:55:17 +08:00
Neil Cuzon e84d0b9334
Update n00b-overview.md 2020-08-20 02:48:59 -07:00
Neil Cuzon 43b0a83b82
Update _sidebar.md 2020-08-20 02:44:09 -07:00
Neil Cuzon 4f7e0941dc
Update n00b-overview.md 2020-08-20 02:44:01 -07:00
Neil Cuzon 70a2e934f9
Update n00b-overview.md 2020-08-20 02:41:11 -07:00
Neil Cuzon 14801805ac
Update integrations.md 2020-08-20 02:40:24 -07:00
Neil Cuzon 54f2bb1daf
Update n00b-overview.md 2020-08-20 02:39:09 -07:00
Marc Faber 4447366118 Improve gantt example in documentation 2020-08-20 00:38:24 +02:00
GDFaber 7140aa1015
Merge pull request #1625 from it-sec-std/patch-1
Fix comments in gantt docs
2020-08-20 00:18:36 +02:00
Lucurus 12a95dfbc6
Update usage.md
Deleted a 0
2020-08-19 19:47:55 +02:00
Lucurus f695fa736d
Update usage.md
Corrected spelling of responsibility.
2020-08-19 18:34:54 +02:00
Lucurus b7e953bc1a
Update n00b-gettingStarted.md
Changed form of verb contain in 3 b.
2020-08-19 18:14:35 +02:00
it-sec-std 8b508bda9a
Update gantt.md
A comment was not marked with propriate syntax, so this example's code didn't work
2020-08-19 16:37:09 +03:00
Neil Cuzon b69e7fbe2c
Update README.md 2020-08-18 19:50:39 -07:00
GDFaber d5062ec5ae
Merge pull request #1621 from mermaid-js/bug/1609_fix_state_and_er_docs
Fix markdown and example code in docs for state and er diagrams
2020-08-18 15:58:12 +02:00
DawMatt b3d1c548e7
Update versionUpdates.md
Styling in the website sidebar was impacted by inconsistent heading levels and unterminated bold statements. These have been normalised to improve sidebar  display.
2020-08-18 23:22:23 +10:00
DawMatt b28af56523
Update _sidebar.md
Removed second, broken version updates link
2020-08-18 23:03:51 +10:00
Neil Cuzon 71d977908d
Update README.md 2020-08-17 23:17:56 -07:00
Neil Cuzon cc0da7d8c6
Update README.md 2020-08-17 23:15:35 -07:00
Marc Faber b55d5c0e39 #1609 Fix markdown and example code in docs for state and er diagrams 2020-08-17 20:26:06 +02:00
Neil Cuzon 7e3848cc76
Update README.md 2020-08-16 23:07:06 -07:00
Neil Cuzon 2ca50de41b
Update README.md 2020-08-16 23:04:05 -07:00
Neil Cuzon b9f45577a7
Update README.md 2020-08-16 22:39:58 -07:00
Neil Cuzon 25dd806a18
Update README.md
Implementing some changes to mirror those, that were made by @Mogztter.
2020-08-16 20:36:25 -07:00
Mattéo Delabre 01344a991d
Add support for changing the length of edges
Resolves #637, resolves #1495.

The syntax for edges is extended to allow for extra
dashes/equals signs/dots (depending on the edge type). Each added
character increases the length of the edge by one rank level, as
follows:

Length            |    1   |    2    |     3    |
------------------|:------:|:-------:|:--------:|
Normal            |  `---` |  `----` |  `-----` |
Normal with arrow |  `-->` |  `--->` |  `---->` |
Thick             |  `===` |  `====` |  `=====` |
Thick with arrow  |  `==>` |  `===>` |  `====>` |
Dotted            |  `-.-` |  `-..-` |  `-...-` |
Dotted with arrow | `-.->` | `-..->` | `-...->` |

This features leverages the `minlen` property exposed by Dagre which was
not previously available when using Mermaid.
2020-08-14 00:15:26 +02:00
Knut Sveidqvist 62260aa30b Merge branch '1592-IncorrectSVGytntax' of git://github.com/jgreywolf/mermaid into jgreywolf-1592-IncorrectSVGytntax 2020-08-13 20:26:47 +02:00
Justin Greywolf 5e72416478 1592-SVG syntax error with links
Added xlink namespace to svg definition
2020-08-12 13:47:21 -07:00
Knut Sveidqvist 50a0c93cce Updated theming docs 2020-08-09 14:22:54 +02:00
Knut Sveidqvist e06cf70615 Using mermaid 8.7.0 in docs 2020-08-09 14:05:10 +02:00
Knut Sveidqvist 2743681392 Merge branch 'develop' into release/8.7.0 2020-08-09 13:36:09 +02:00
Knut Sveidqvist aacf84f78a Some documentation updates 2020-08-09 07:45:37 +02:00
Knut Sveidqvist 77541102af Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-08-08 10:59:59 +02:00
Knut Sveidqvist b99c14b910
Merge pull request #1599 from jgreywolf/1181-AssignCssClass
1181 assign css class
2020-08-05 20:40:07 +02:00
ryenus 067b495212
update mermaid-cli repo url
new url: https://github.com/mermaid-js/mermaid-cli
2020-08-05 05:46:48 +08:00
Justin Greywolf 9a86accc62 1181-Minor update to regex 2020-08-04 12:05:56 -07:00
Knut Sveidqvist 77be268a70
Merge pull request #1596 from NeilCuzon/develop
Changes to ReadMe.md, Addition of versionUpdates.md for version tracking.
2020-08-04 20:08:44 +02:00
Justin Greywolf 1f051d7a9f 1181-Css for class diagrams
Initial change for supporting custom CSS for use with classDiagrams.
updated `LABEL` regex for specificity
2020-08-03 12:47:50 -07:00
Neil Cuzon 1b56a8b696
Update theming.md 2020-07-31 23:45:56 -07:00
Neil Cuzon 5a5d2c770c
Update _sidebar.md 2020-07-31 22:54:47 -07:00
Neil Cuzon a5d06bde03
Update theming.md 2020-07-31 21:22:18 -07:00
Neil Cuzon 15103ac7fb
Update theming.md 2020-07-31 21:20:55 -07:00
Neil Cuzon 7f5df308ad
Update README.md 2020-07-31 21:20:26 -07:00
Neil Cuzon 2f97baadc6
Update README.md 2020-07-31 21:16:33 -07:00
Neil Cuzon c2863156cd
Update versionUpdates.md 2020-07-31 21:12:31 -07:00
Neil Cuzon 75762d64c6
Update theming.md 2020-07-31 21:10:43 -07:00
Neil Cuzon 8209cffcd0
Update versionUpdates.md 2020-07-31 21:10:04 -07:00
Neil Cuzon 70976460ff
Update _sidebar.md 2020-07-31 20:59:27 -07:00
Neil Cuzon 954155b090
Update theming.md 2020-07-31 20:52:06 -07:00
Neil Cuzon 5265bc20f1
Update theming.md 2020-07-31 20:49:35 -07:00
Knut Sveidqvist 87f12c7d5a Updated with a small example of a custom theme 2020-07-31 16:04:12 +02:00
Knut Sveidqvist e9e9b13df0 Added themeVariable references and som adjustments in base theme calculations. 2020-07-31 15:05:51 +02:00
Neil Cuzon 7ee9c4fb30
Update n00b-overview.md 2020-07-31 00:56:32 -07:00
Neil Cuzon e43fd0c48a
Update README.md 2020-07-31 00:55:21 -07:00
Neil Cuzon 8abe138150
Update versionUpdates.md 2020-07-30 23:46:13 -07:00
Neil Cuzon dccb23bb80
Update theming.md 2020-07-30 13:50:39 -07:00
Knut Sveidqvist 36e421eb5f
Merge pull request #1586 from mermaid-js/1542_take_two
1542 take two
2020-07-30 08:58:56 +02:00
Knut Sveidqvist a5b01c3f6f #1542 Adding gantt to showcases 2020-07-30 08:34:41 +02:00
Neil Cuzon 292289d16d
Update README.md 2020-07-29 23:06:16 -07:00
Marc Faber b17475f013 #1366 Flowchart documentation: Fix code example for styling nodes 2020-07-30 01:18:58 +02:00
Knut Sveidqvist a4bf85b1b6 #1542 Making sure config and directives works for overriding theme variables using initialize call or directives + tests 2020-07-29 18:38:59 +02:00
Knut Sveidqvist d215d31349
Merge pull request #1585 from GDFaber/feature/1460_add_link_target_to_flowchart_click
Add link target option to flowchart click
2020-07-29 15:13:35 +02:00
Neil Cuzon e4e24399d9
Update theming.md 2020-07-28 19:10:14 -07:00
Neil Cuzon 8f9d132ed6
Update theming.md 2020-07-28 19:06:34 -07:00
Neil Cuzon e651511c35
Update theming.md 2020-07-28 19:01:01 -07:00
Neil Cuzon 2ecda17618
Update theming.md 2020-07-28 18:56:17 -07:00
Neil Cuzon db03b5b102
Update theming.md 2020-07-28 18:28:52 -07:00
Neil Cuzon 9fd9a7bc10
Update 8.6.0_docs.md 2020-07-28 16:42:08 -07:00
Knut Sveidqvist cf70678188
Merge branch 'develop' into feature/1460_add_link_target_to_flowchart_click 2020-07-28 13:21:31 +02:00
Knut Sveidqvist b23988c947
Merge pull request #1582 from cmmoran/develop
Directive support for many diagrams, config bugfix
2020-07-28 13:17:35 +02:00
Marc Faber d04d8c3a1d #1460 Add link target option to flowchart click 2020-07-28 10:49:54 +02:00
chris moran e7ca6c16ff
Tweaked PIE (got rid of some parsing conflicts) 2020-07-27 14:15:38 -04:00
Knut Sveidqvist 5a7d770a58 #1542 Setting up base theme for custom theming 2020-07-27 10:01:34 +02:00
Neil Cuzon 336793b2a1
Update versionUpdates.md 2020-07-26 23:28:51 -07:00
Neil Cuzon c29ea2e679
Update README.md 2020-07-26 23:28:24 -07:00
Neil Cuzon 3b6f05800d
Update README.md 2020-07-26 23:04:11 -07:00
Neil Cuzon dda824856a
Update usage.md 2020-07-26 22:20:52 -07:00
Neil Cuzon 6bef35d8ef
Merge branch 'develop' into release/8.6.0 2020-07-26 21:17:52 -07:00
Neil Cuzon ad12660019
Update versionUpdates.md 2020-07-26 21:15:13 -07:00
Neil Cuzon 016da1d37d
Create versionUpdates.md 2020-07-26 21:13:54 -07:00
Knut Sveidqvist 4e12f959fc Updated after 8.6.4 merge 2020-07-26 22:38:55 +02:00
Knut Sveidqvist 1c06e9d683 Merge remote-tracking branch 'origin/develop' into develop 2020-07-26 22:37:15 +02:00
Knut Sveidqvist 01d7a33230 Merge branch 'master' into develop 2020-07-26 22:37:10 +02:00