summaryrefslogtreecommitdiff
path: root/src/components/settings/Settings.h
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-06-29 21:10:36 +0200
committerKieran Cawthray <kieranc@gmail.com>2021-06-29 21:10:36 +0200
commit4f21748aa2a4693bd4b243ab0ebe11482d1aaf09 (patch)
tree762dd147b5d08db903da93883e7dc8dcaf6292cd /src/components/settings/Settings.h
parent660a8597f6edc66deec94782817613e1a4f84a6d (diff)
parentf317d54218659af437d840d00fd349e7919a243f (diff)
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'src/components/settings/Settings.h')
0 files changed, 0 insertions, 0 deletions