Yannick Warnier eab6dd22d2 Fix conflict importing everything from 1.11.x -refs BT#12413 | %!s(int64=7) %!d(string=hai) anos | |
---|---|---|
.. | ||
index.html | 94984e6b12 merge | %!s(int64=10) %!d(string=hai) anos |
trad4all.inc.php | eab6dd22d2 Fix conflict importing everything from 1.11.x -refs BT#12413 | %!s(int64=7) %!d(string=hai) anos |