kolaente 67f66d6bb5 Resolved Conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-12 14:19:20 +02:00
..
defaults.go	docs: update translation on homepage for zh-tw (#634)	2017-01-11 09:23:42 +01:00
setting.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00