Merge branch 'feature/custom-color'

Author Richard Atterfalk <richard@atterfalk.se>
Author date 2019-03-21 18:44:17
Author local date 2019-03-21 19:44:17 +0100
Committer Richard Atterfalk <richard@atterfalk.se>
Committer date 2019-03-21 18:44:17
Committer local date 2019-03-21 19:44:17 +0100
Commit HEAD
Tree 517e2935243cb56467de1ce7d9f2ce2dcaf86fcd
Parent 539352d8810058d1a4037880aec82b217fbfaf31
Parent 1910619204a8694e6e655260ed71131250876915
Merge branch 'feature/custom-color'