kolaente 67f66d6bb5 Resolved Conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-12 14:19:20 +02:00
..
delete.tmpl
hook_new.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hooks.tmpl	Fix org hooks UI (#2072)	2017-06-28 16:53:50 +08:00
navbar.tmpl
options.tmpl	fix: remove str2html from org full name (#1360)	2017-04-05 18:31:31 -07:00