Edd Baldry 91a000a020 Fix merge conflicts, including migration merge issue 8 rokov pred
..
css 91a000a020 Fix merge conflicts, including migration merge issue 8 rokov pred
img aecb17f67e Static serving, URL config, start of bootstrap 8 rokov pred
js aecb17f67e Static serving, URL config, start of bootstrap 8 rokov pred