Merge branch 'CJL-NEW'

wxr

2020-12-08 273bd8b4fb918a4303207215b2b8369fbc275000

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>