Niels profile #26

Merged

11025980 merged 4 commits from niels-profile into master

2017-06-28 13:16:15 +02:00

Author	SHA1	Message	Date
Niels Zwemmer	43a1fcd52c	Merge remote-tracking branch 'origin/master' into niels-profile	2017-06-28 13:15:19 +02:00
Felix Atsma	a04866ba3f	Merge branch 'felix' into 'master' Timeline improvements See merge request !25	2017-06-28 13:14:09 +02:00
Felix Atsma	f1befdd21c	Merge remote-tracking branch 'origin/master' into felix	2017-06-28 13:13:34 +02:00
Felix Atsma	cab6728a54	Improve timeline layout	2017-06-28 13:12:48 +02:00