diff options
| author | codecalm <codecalm@gmail.com> | 2021-01-20 22:18:49 +0100 |
|---|---|---|
| committer | codecalm <codecalm@gmail.com> | 2021-01-20 22:18:49 +0100 |
| commit | c8da3525fac1d02e48b957a0ed9676b28e38e394 (patch) | |
| tree | d29c214daad37893134cd10637cc3536f37fcd2d /icons/git-merge.svg | |
| parent | Update README.md (diff) | |
| parent | Merge pull request #104 from tabler/dev-iconfont-generation (diff) | |
| download | tabler-icons-c8da3525fac1d02e48b957a0ed9676b28e38e394.tar.xz | |
Merge branch 'dev' of https://github.com/tabler/tabler-icons
Conflicts:
iconfont/fonts/tabler-icons.eot
iconfont/fonts/tabler-icons.ttf
iconfont/fonts/tabler-icons.woff
iconfont/fonts/tabler-icons.woff2
Diffstat (limited to 'icons/git-merge.svg')
0 files changed, 0 insertions, 0 deletions