Lauris BH be1330ec89 Remove hardcoded paths to fix randomly failing tests (#3347) ... * Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path		2018-01-11 00:46:59 +01:00
..
defaults.go	Fix language names (#2955)	2017-11-23 12:00:48 +08:00
setting.go	Remove hardcoded paths to fix randomly failing tests (#3347)	2018-01-11 00:46:59 +01:00