diff options
| author | Mark Otto <[email protected]> | 2014-02-11 00:05:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 00:05:34 -0800 |
| commit | 2cef0af211e8b6780fff90fe5f110493585aa97c (patch) | |
| tree | f39853dee83f6fd764e1ceb3b80443010514a8f8 | |
| parent | 6f0059c5273bc6b051df411b9844b91b2b46a0cd (diff) | |
| parent | 020ea27d28b6c89b2b1433eb1e618c69ad3a95a8 (diff) | |
| download | bootstrap-2cef0af211e8b6780fff90fe5f110493585aa97c.tar.xz bootstrap-2cef0af211e8b6780fff90fe5f110493585aa97c.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r--[-rwxr-xr-x] | fonts/glyphicons-halflings-regular.eot | bin | 20335 -> 20335 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | fonts/glyphicons-halflings-regular.svg | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | fonts/glyphicons-halflings-regular.ttf | bin | 41280 -> 41280 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | fonts/glyphicons-halflings-regular.woff | bin | 23320 -> 23320 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot Binary files differindex 4a4ca865d..4a4ca865d 100755..100644 --- a/fonts/glyphicons-halflings-regular.eot +++ b/fonts/glyphicons-halflings-regular.eot diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg index e3e2dc739..e3e2dc739 100755..100644 --- a/fonts/glyphicons-halflings-regular.svg +++ b/fonts/glyphicons-halflings-regular.svg diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf Binary files differindex 67fa00bf8..67fa00bf8 100755..100644 --- a/fonts/glyphicons-halflings-regular.ttf +++ b/fonts/glyphicons-halflings-regular.ttf diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff Binary files differindex 8c54182aa..8c54182aa 100755..100644 --- a/fonts/glyphicons-halflings-regular.woff +++ b/fonts/glyphicons-halflings-regular.woff |
