Merge branch 'github-social-icon' into improved-icons

Browse source

Conflicts:
	docs/changelog.rst

...

This commit is contained in:

David Beitey 2012-11-04 12:09:28 +10:00

parent 705ab7b0f8 4afc32c425

commit 41d3a1e8dd

3 changed files with 4 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

pelican/themes/notmyidea/static/images/icons/github.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 360 B