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 /SoMA2/static/images | |
parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'SoMA2/static/images')
-rw-r--r-- | SoMA2/static/images/blue-pin.png | bin | 0 -> 1564 bytes |
-rw-r--r-- | SoMA2/static/images/body-bg.jpg | bin | 0 -> 942 bytes |
-rw-r--r-- | SoMA2/static/images/favicon.ico | bin | 0 -> 16958 bytes |
-rw-r--r-- | SoMA2/static/images/icons/delicious.png | bin | 0 -> 958 bytes |
-rw-r--r-- | SoMA2/static/images/icons/facebook.png | bin | 0 -> 202 bytes |
-rw-r--r-- | SoMA2/static/images/icons/github.png | bin | 0 -> 346 bytes |
-rw-r--r-- | SoMA2/static/images/icons/gitorious.png | bin | 0 -> 227 bytes |
-rw-r--r-- | SoMA2/static/images/icons/gittip.png | bin | 0 -> 487 bytes |
-rw-r--r-- | SoMA2/static/images/icons/google-plus.png | bin | 0 -> 527 bytes |
-rw-r--r-- | SoMA2/static/images/icons/lastfm.png | bin | 0 -> 975 bytes |
-rw-r--r-- | SoMA2/static/images/icons/linkedin.png | bin | 0 -> 896 bytes |
-rw-r--r-- | SoMA2/static/images/icons/rss.png | bin | 0 -> 879 bytes |
-rw-r--r-- | SoMA2/static/images/icons/twitter.png | bin | 0 -> 830 bytes |
13 files changed, 0 insertions, 0 deletions
diff --git a/SoMA2/static/images/blue-pin.png b/SoMA2/static/images/blue-pin.png Binary files differnew file mode 100644 index 0000000..60bd2d5 --- /dev/null +++ b/SoMA2/static/images/blue-pin.png diff --git a/SoMA2/static/images/body-bg.jpg b/SoMA2/static/images/body-bg.jpg Binary files differnew file mode 100644 index 0000000..d63c156 --- /dev/null +++ b/SoMA2/static/images/body-bg.jpg diff --git a/SoMA2/static/images/favicon.ico b/SoMA2/static/images/favicon.ico Binary files differnew file mode 100644 index 0000000..fb02bc8 --- /dev/null +++ b/SoMA2/static/images/favicon.ico diff --git a/SoMA2/static/images/icons/delicious.png b/SoMA2/static/images/icons/delicious.png Binary files differnew file mode 100644 index 0000000..3dccdd8 --- /dev/null +++ b/SoMA2/static/images/icons/delicious.png diff --git a/SoMA2/static/images/icons/facebook.png b/SoMA2/static/images/icons/facebook.png Binary files differnew file mode 100644 index 0000000..74e7ad5 --- /dev/null +++ b/SoMA2/static/images/icons/facebook.png diff --git a/SoMA2/static/images/icons/github.png b/SoMA2/static/images/icons/github.png Binary files differnew file mode 100644 index 0000000..6c52b48 --- /dev/null +++ b/SoMA2/static/images/icons/github.png diff --git a/SoMA2/static/images/icons/gitorious.png b/SoMA2/static/images/icons/gitorious.png Binary files differnew file mode 100644 index 0000000..3eeb3ec --- /dev/null +++ b/SoMA2/static/images/icons/gitorious.png diff --git a/SoMA2/static/images/icons/gittip.png b/SoMA2/static/images/icons/gittip.png Binary files differnew file mode 100644 index 0000000..af94962 --- /dev/null +++ b/SoMA2/static/images/icons/gittip.png diff --git a/SoMA2/static/images/icons/google-plus.png b/SoMA2/static/images/icons/google-plus.png Binary files differnew file mode 100644 index 0000000..3c6b743 --- /dev/null +++ b/SoMA2/static/images/icons/google-plus.png diff --git a/SoMA2/static/images/icons/lastfm.png b/SoMA2/static/images/icons/lastfm.png Binary files differnew file mode 100644 index 0000000..3a6c626 --- /dev/null +++ b/SoMA2/static/images/icons/lastfm.png diff --git a/SoMA2/static/images/icons/linkedin.png b/SoMA2/static/images/icons/linkedin.png Binary files differnew file mode 100644 index 0000000..d29c120 --- /dev/null +++ b/SoMA2/static/images/icons/linkedin.png diff --git a/SoMA2/static/images/icons/rss.png b/SoMA2/static/images/icons/rss.png Binary files differnew file mode 100644 index 0000000..7862c65 --- /dev/null +++ b/SoMA2/static/images/icons/rss.png diff --git a/SoMA2/static/images/icons/twitter.png b/SoMA2/static/images/icons/twitter.png Binary files differnew file mode 100644 index 0000000..d0ef3cc --- /dev/null +++ b/SoMA2/static/images/icons/twitter.png |