FinnStutzenstein 4bc9a26c4c Fixing merge conflicts (fixes #2927)		2017-02-03 08:40:48 +01:00
..
js/assignments	Fixing merge conflicts (fixes #2927)	2017-02-03 08:40:48 +01:00
templates/assignments	Fixed wrong order of assignment votes caused by redis cache.	2017-01-30 21:33:41 +01:00