Niko Strijbol 3ce3f15dc6 Merge remote-tracking branch 'origin/master' into old-boards ... # Conflicts: # content/about/contact.erb		2019-06-07 14:41:57 +02:00
..
about.erb	s/12Urenloop/12urenloop/ in about page	2019-06-02 00:02:23 +12:00
historiek.md	uiversiteit -> universiteit	2018-10-29 19:46:30 +01:00
oud-bestuur.erb	Add old board members	2019-05-22 19:38:54 +02:00
statuten.md	Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into tibovanheule-master	2018-10-16 22:24:19 +02:00
verslagen.erb	Fix title in reports	2019-06-07 14:37:17 +02:00