aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorcodecalm <codecalm@gmail.com>2020-03-21 22:38:48 +0100
committercodecalm <codecalm@gmail.com>2020-03-21 22:38:48 +0100
commit3147e0427178f533d85f43c7629ba3c712d8e87b (patch)
tree134d8ce6846570a05348fbe19d34e10db62f41ba /package.json
parentMerge branches 'dev' and 'master' of https://github.com/tabler/tabler-icons i... (diff)
parentreadme fix (diff)
downloadtabler-icons-3147e0427178f533d85f43c7629ba3c712d8e87b.tar.xz
Merge branches 'dev' and 'master' of https://github.com/tabler/tabler-icons into dev
 Conflicts:  .github/icons.png  gulpfile.js
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions