Merge branch 'master' of github.com:fernandoflorez/pelican

Browse source

Conflicts:
	pelican/generators.py

...

This commit is contained in:

Fernando Flórez 2014-04-15 13:13:00 -05:00

parent 2bdd1b28a4 dcdbd5333f

commit 681d170f26

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

Diff content is not available