Merge branch 'master' into apa-notification-on-live

This commit is contained in:
apa420
2018-08-28 23:23:46 +02:00
committed by GitHub
214 changed files with 4368 additions and 4428 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "common/SerializeCustom.hpp"
#include "common/Singleton.hpp"
#include "util/RapidJsonSerializeQString.hpp"
#include <QBrush>
#include <QColor>