Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit a8add1f58e - Show all commits

View File

@@ -7,4 +7,7 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="primaryColour">#115571</color>
<color name="secondaryColour">#31AFB4</color>
<color name="buttonColour">#14212D</color>
</resources>