diff options
| author | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
|---|---|---|
| committer | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
| commit | cfa5f40283668540cda45794200809640f251acd (patch) | |
| tree | cf2bd8ffbea3ed4c01b5690ffd8ae2702976b583 /pelican-bootstrap3/static/fonts/FontAwesome.otf | |
| parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
| parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
| download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.zip pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'pelican-bootstrap3/static/fonts/FontAwesome.otf')
| -rw-r--r-- | pelican-bootstrap3/static/fonts/FontAwesome.otf | bin | 61896 -> 62856 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pelican-bootstrap3/static/fonts/FontAwesome.otf b/pelican-bootstrap3/static/fonts/FontAwesome.otf Binary files differindex 7012545..8b0f54e 100644 --- a/pelican-bootstrap3/static/fonts/FontAwesome.otf +++ b/pelican-bootstrap3/static/fonts/FontAwesome.otf |