aboutsummaryrefslogtreecommitdiff
path: root/src/favicon.ico
diff options
context:
space:
mode:
authorcodecalm <codecalm@gmail.com>2020-12-13 21:13:47 +0100
committercodecalm <codecalm@gmail.com>2020-12-13 21:13:47 +0100
commit33117bbd666a57188d36d68864078218e5d381ac (patch)
treed783f140785c30c4882f8730293a3e71486c56b1 /src/favicon.ico
parentMerge branch 'master' of https://github.com/tabler/tabler-icons into dev (diff)
parentRelease 1.38.0 (diff)
downloadtabler-icons-33117bbd666a57188d36d68864078218e5d381ac.tar.xz
Merge branch 'master' of https://github.com/tabler/tabler-icons into dev
 Conflicts:  src/_icons/file-info.svg  src/_icons/file-report.svg  src/_icons/files-off.svg  src/_icons/files.svg  src/_icons/number-0.svg  src/_icons/number-1.svg  src/_icons/number-2.svg  src/_icons/number-3.svg  src/_icons/number-4.svg  src/_icons/number-5.svg  src/_icons/number-6.svg  src/_icons/number-7.svg  src/_icons/number-8.svg  src/_icons/number-9.svg  src/_icons/receipt-2.svg  src/_icons/receipt-off.svg  src/_icons/receipt-refund.svg  src/_icons/receipt.svg
Diffstat (limited to 'src/favicon.ico')
0 files changed, 0 insertions, 0 deletions