Yannick Warnier eab6dd22d2 Fix conflict importing everything from 1.11.x -refs BT#12413 7 rokov pred
..
index.html 94984e6b12 merge 10 rokov pred
trad4all.inc.php eab6dd22d2 Fix conflict importing everything from 1.11.x -refs BT#12413 7 rokov pred