Alexander Belanger ce94356351 fix merge conflicts and router endpoints 5 rokov pred
..
config.go ce94356351 fix merge conflicts and router endpoints 5 rokov pred