Skip to content

Commit a0eaa24

Browse files
committed
Merge branch 'master' into parallel/3
2 parents 60a1d82 + 87bfc25 commit a0eaa24

111 files changed

Lines changed: 2551 additions & 100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs-src/user-guide/field-types.md

Lines changed: 7 additions & 4 deletions

docs-src/user-guide/settings.md

Lines changed: 8 additions & 0 deletions

docs/404.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@
389389

390390

391391

392+
393+
392394

393395

394396

@@ -620,6 +622,27 @@
620622

621623

622624

625+
<li class="md-nav__item">
626+
<a href="/user-guide/importing-from-excel/" class="md-nav__link">
627+
628+
629+
<span class="md-ellipsis">
630+
Importing from Excel
631+
</span>
632+
633+
634+
</a>
635+
</li>
636+
637+
638+
639+
640+
641+
642+
643+
644+
645+
623646
<li class="md-nav__item">
624647
<a href="/user-guide/settings/" class="md-nav__link">
625648

1.55 MB
Binary file not shown.
464 KB
Binary file not shown.
598 KB
Binary file not shown.
184 KB
Binary file not shown.
32.2 KB
Binary file not shown.
42.5 KB
Binary file not shown.
157 KB
Binary file not shown.

0 commit comments

Comments
 (0)