Merge branch 'master' of gitlab.ethz.ch:thealternative/courses

merge

Merge branch 'master' of gitlab.ethz.ch:thealternative/courses
merge
86618960 · Alexander Schoch · 08978d52 · 97609190 · 86618960 · 08978d52
Commit 86618960 authored Oct 25, 2019 by Alexander Schoch
--- a/.gitattributes
+++ b/.gitattributes
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.svg filter=lfs diff=lfs merge=lfs -text
+*.xcf filter=lfs diff=lfs merge=lfs -text
+*.bbl filter=lfs diff=lfs merge=lfs -text
--- a/FOSS_course/img/BendixG15-2015.jpg
+++ b/FOSS_course/img/BendixG15-2015.jpg
--- a/FOSS_course/img/app.png
+++ b/FOSS_course/img/app.png
--- a/FOSS_course/img/canonical.png
+++ b/FOSS_course/img/canonical.png
--- a/FOSS_course/img/chrome.png
+++ b/FOSS_course/img/chrome.png
--- a/FOSS_course/img/chromium.png
+++ b/FOSS_course/img/chromium.png
--- a/FOSS_course/img/cl.png
+++ b/FOSS_course/img/cl.png
--- a/FOSS_course/img/contrib.png
+++ b/FOSS_course/img/contrib.png
--- a/FOSS_course/img/docker.png
+++ b/FOSS_course/img/docker.png
--- a/FOSS_course/img/drive.png
+++ b/FOSS_course/img/drive.png
--- a/FOSS_course/img/dropbox.png
+++ b/FOSS_course/img/dropbox.png
--- a/FOSS_course/img/fsf.png
+++ b/FOSS_course/img/fsf.png
--- a/FOSS_course/img/gp.png
+++ b/FOSS_course/img/gp.png
--- a/FOSS_course/img/icloud.png
+++ b/FOSS_course/img/icloud.png
--- a/FOSS_course/img/osi.png
+++ b/FOSS_course/img/osi.png
--- a/FOSS_course/img/play.png
+++ b/FOSS_course/img/play.png
--- a/FOSS_course/img/rh.png
+++ b/FOSS_course/img/rh.png
--- a/FOSS_course/img/tor.png
+++ b/FOSS_course/img/tor.png
--- a/FOSS_course/img/tux.png
+++ b/FOSS_course/img/tux.png
--- a/FOSS_course/slides.pdf
+++ b/FOSS_course/slides.pdf