Sander Mathijs van Veen 388bdb396f Fix merge conflict. 13 rokov pred
..
cross.png 388bdb396f Fix merge conflict. 13 rokov pred
info.png 388bdb396f Fix merge conflict. 13 rokov pred
load.gif 388bdb396f Fix merge conflict. 13 rokov pred
tick.png 388bdb396f Fix merge conflict. 13 rokov pred