Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Theresa Gresch 2020-01-20 18:20:32 +01:00
commit 563ce1d112

View file

@ -103,7 +103,7 @@
"primary": "#B2BEB5",
"secondary-dark": "#353839",
"secondary": "#989898",
"secondary-light": "#858889",
"secondary-light": "#B8B8B8",
"accent": "#656565",
"error": "#E57373",
"info": "#00ACC1",