aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorcodecalm <codecalm@gmail.com>2020-03-21 22:15:06 +0100
committercodecalm <codecalm@gmail.com>2020-03-21 22:15:06 +0100
commitd74bcb00743c5cfdbef1e49c211c1b5d53f81c26 (patch)
tree9f626c8a5625e506dfb002ab22429eb8423c7ad8 /.github
parentdiff changelog (diff)
parentsprite-nostroke new file, version 1.0.2 (diff)
downloadtabler-icons-d74bcb00743c5cfdbef1e49c211c1b5d53f81c26.tar.xz
Merge branches 'dev' and 'master' of https://github.com/tabler/tabler-icons into dev
 Conflicts:  .github/icons.png  package.json
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions