Konrad Langenberg 74a0df7a3b Merged with upstream/master, resolved conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-17 20:38:30 +02:00
..
comments.tmpl	Merged with upstream/master, resolved conflicts	2017-09-17 20:38:30 +02:00
pull.tmpl
sidebar.tmpl	Fixed conflict with timetracking	2017-09-12 22:20:57 +02:00