Karel Picman 68ff8c0886 Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

..

cs.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

de.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

en.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

es.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

fr.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

it.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

ja.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

pl.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

pt-BR.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

ru.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

sl.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

zh-TW.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00

zh.yml

Merge master to devel-1.6.0 - conflicts

2017-03-24 12:51:05 +01:00