Commit abc63fa6 authored by Jeroen F.J. Laros's avatar Jeroen F.J. Laros

Merge branch 'patch-2' into 'master'

Update schedule.md

See merge request humgen/development-wd!41
parents a198f981 201ef711
...@@ -58,7 +58,7 @@ Presentations from [2017](schedule_2017.md). ...@@ -58,7 +58,7 @@ Presentations from [2017](schedule_2017.md).
- Brainstorming AI applications in Genomics (Jeroen/Peter/Sander/Leon/Guy) - Brainstorming AI applications in Genomics (Jeroen/Peter/Sander/Leon/Guy)
- June 11: - June 11:
- Complexity theory (Mark). - Single Sign-On with SAML (Mark).
- June 18: - June 18:
- Open Source software licensing and compatibility (Bastian). - Open Source software licensing and compatibility (Bastian).
...@@ -80,6 +80,7 @@ Presentations from [2017](schedule_2017.md). ...@@ -80,6 +80,7 @@ Presentations from [2017](schedule_2017.md).
- Main purposes of programming languages. - Main purposes of programming languages.
- General purpose GPU computing. - General purpose GPU computing.
- Applied machine learning with SK-learn / scikit (Guy) - Applied machine learning with SK-learn / scikit (Guy)
- Complexity theory
- Notes. - Notes.
- Generic topics, but with a link to current activities. - Generic topics, but with a link to current activities.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment