Skip to content

Commit 8d0aec1

Browse files
Merge branch 'develop'
2 parents fb3ecb0 + f8d9114 commit 8d0aec1

32 files changed

+9281
-7196
lines changed

.githooks/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GITHOOKS_DIR=`pwd -P`
1010
popd
1111
PROJECT_ROOT=`dirname $GITHOOKS_DIR`
1212

13-
MINOR_VERSION=$(cat $PROJECT_ROOT/VERSION | grep -o "[[:digit:]]\.[[:digit:]]")
13+
MINOR_VERSION=$(cat $PROJECT_ROOT/VERSION | grep -oE "\\d+\\.\\d+")
1414

1515
if [[ -z "${STAGE_STATIC_ASSETS:-}" ]]; then
1616
echo "[pre-commit]: Unstaging assets directory"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.3
1+
1.10.0

_layouts/spec.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
version_string: v1.9
2+
version_string: v1.10
33
---
44
<!DOCTYPE html>
55
<html lang="{{ site.lang | default: "en-US" }}">
@@ -40,7 +40,7 @@
4040
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji" !important;
4141
}
4242
</style>
43-
<script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js" crossorigin="anonymous" defer></script>
43+
<script src="https://cdn.jsdelivr.net/npm/mermaid@9/dist/mermaid.min.js" crossorigin="anonymous" defer></script>
4444
{%- endif %}
4545

4646
<!--
File renamed without changes.
File renamed without changes.

assets/v1.10/js/262.primer_spec_plugin.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/v1.10/js/262.primer_spec_plugin.min.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/v1.10/js/424.primer_spec_plugin.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)