Sparky4567 308f968576 Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

..

de_CH.json

Yello

2018-02-25 20:28:26 +02:00

de_DE.json

Yello

2018-02-25 20:28:26 +02:00

en.json

Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

tr_TR.json

Create tr_TR.json

2018-01-26 21:30:35 +03:00