Merge branch 'master' of gitlab.constantvzw.org:osp/work.w

2ee51c43 · gijs · 13ff76d8 · 52b12ad6 · 2ee51c43 · 2ee51c43
Commit 2ee51c43 authored Mar 29, 2018 by gijs
--- a/layout/layout-block.png
+++ b/layout/layout-block.png
--- a/layout/layout-block.svg
+++ b/layout/layout-block.svg
--- a/layout/sketch.jpg
+++ b/layout/sketch.jpg