summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-07-23 15:03:28 +0200
committerKieran Cawthray <kieranc@gmail.com>2021-07-23 15:03:28 +0200
commit1ddb1f0832b31def410ed5d2f1094e36f389734f (patch)
tree48cafce2f13dfcb1456c68a038af8fd38e2604fd /.gitattributes
parent5e4d3c87e92b8f2dd1020577f3ebad93322b0f6f (diff)
parentd6cccc2dcd95a7d332ee657d1357ae060389f6e6 (diff)
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions