Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 343536d04f83c518043610ea297030b9c0ce029c

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="colorPrimary">#2c3e50</color>
    <color name="colorPrimaryDark">#1B3147</color>
    <color name="colorAccent">#3498db</color>
</resources>