Merge branch tests into main. (See #44)

Browse source

Conflicts:
	pelican/contents.py
	pelican/settings.py
	samples/pelican.conf.py

...

This commit is contained in:

Alexis Metaireau 2011-05-10 23:18:11 +01:00

parent aab3ee78dc 8454b0d1b8

commit 371892ceaa

6 changed files with 128 additions and 22 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

0

pelican/tests/__init__.py Normal file

Unescape Escape View file