Johannes Mockenhaupt 0f034dd662 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check for duration in json untranslatable strings greek language check for null queue logging		2017-12-05 23:19:05 +01:00
..
nightscout	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-05 23:19:05 +01:00