Stefan Parviainen 2c1618bc10 Fix conflict and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
..
2017-11-05 14:56:41 -07:00
2017-06-01 21:10:32 +02:00
2017-11-14 20:08:27 +01:00
2016-10-11 14:20:40 +01:00
2017-07-12 18:05:08 +01:00
2017-10-11 17:56:17 +01:00
2017-10-11 17:56:17 +01:00
2017-10-11 17:56:17 +01:00
2017-10-11 17:56:17 +01:00