Merge branch 'master' into develop

traitecoevo · Feb 11, 2024 · 31fbd8a · 31fbd8a
2 parents d621da3 + 88d52c4
commit 31fbd8a
Show file tree

Hide file tree

Showing 131 changed files with 24,636 additions and 55,733 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ temp
 
 ontology/traits.build.html
 ontology/traits.build.rmarkdown
+ontology/index.html
diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -23,7 +23,7 @@ navbar:
     href: https://traitecoevo.github.io/traits.build-book/
   - text: Ontology
     icon: fa-book
-    href: ontology/traits.build.html
+    href: ontology/index.html
   - text: News
     href: news/index.html
   right:

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/ontology/build_triples.csv b/docs/ontology/build_triples.csv
diff --git a/docs/ontology/index.html b/docs/ontology/index.html
diff --git a/ontology/traits.build.html → docs/ontology/release/0.1.0/index.html b/ontology/traits.build.html → docs/ontology/release/0.1.0/index.html
diff --git a/docs/ontology/release/0.1.0/traits.build.html b/docs/ontology/release/0.1.0/traits.build.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ temp

		ontology/traits.build.html
		ontology/traits.build.rmarkdown
		ontology/index.html