Jonathan Poelman 2ae155b877 fixed merge conflict in question layout		2020-02-27 21:50:42 +01:00
..
navbar.erb	Bare-bones basic setup	2020-02-27 16:55:36 +01:00
question.erb	fixed merge conflict in question layout	2020-02-27 21:50:42 +01:00