Artur Paikin 8bcf1c6897 Merge branch 'master' into 2.0 3 rokov pred
..
@uppy 8bcf1c6897 Merge branch 'master' into 2.0 3 rokov pred
uppy 172cc77f63 Merge master 3 rokov pred