Kevin Röbert 3f4eca1890 Merge remote-tracking branch 'origin/master' ... # Conflicts: # data/data.json		2017-10-05 14:40:03 +02:00
..
data.json	Merge remote-tracking branch 'origin/master'	2017-10-05 14:40:03 +02:00