Skip to content

Commit 0e770fa

Browse files
authored
Merge pull request #91 from poseidon-framework/v300
dev branch to collect all changes for Poseidon v3.0.0
2 parents 68a1263 + 9124132 commit 0e770fa

21 files changed

Lines changed: 1511 additions & 745 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ _site/
22
.jekyll-cache/
33
.Rhistory
44
node_modules/
5+
.DS_Store

_sidebar.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* [<i class="fas fa-globe-europe" aria-hidden="true"></i> Archive explorer](https://server.poseidon-adna.org)
1212
* [<i class="fas fa-newspaper" aria-hidden="true"></i> Paper directory](https://papers.poseidon-adna.org/)
1313
* [<i class="fa fa-comments" aria-hidden="true"></i> Blog](http://blog.poseidon-adna.org)
14-
* [<i class="fab fa-github" aria-hidden="true"></i> Github](https://github.com/poseidon-framework/poseidon-framework.github.io)
14+
* [<i class="fab fa-github" aria-hidden="true"></i> Github](https://github.com/poseidon-framework)
1515
* **<i class="fas fa-clipboard-list" aria-hidden="true"></i>&nbsp; The Poseidon Standard**
1616
* [Poseidon package](standard.md)
1717
* [Genotype data](genotype_data.md)

acknowledgements.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Poseidon depends on a large community of contributors and advisors. Here we list project alumni and other contributors.
44

5+
- **Luca Thale-Bombien**: Student assistant for the Poseidon project in 2024 and 2025.
56
- **Dhananjaya Bandara Aththanayaka Aththanayaka Mudiyanselage**: Student assistant for the Poseidon project from 2021 to 2025.
67
- **Kenana Saeed**: Student assistant for the Poseidon project in 2024.
78
- **Michelle O´Reilly**: Design of the Poseidon logo and colour palette.

0 commit comments

Comments
 (0)