diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-02-26 01:12:31 +0100 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-02-26 01:12:31 +0100 |
| commit | bbd50186cdfbc18ac2a236f3d162d95f8c514301 (patch) | |
| tree | 0ff7d084147bb69a07251740f6137ba3dd495378 /font/FontAwesome.otf | |
| parent | 1de1fff0d9a7d8f89e0bd755f6e825e261b025df (diff) | |
| parent | fdd27e6a122c54edeaa0d2fa6ef454b358a857c5 (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
component.json
Diffstat (limited to 'font/FontAwesome.otf')
0 files changed, 0 insertions, 0 deletions