github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feeddomain

Browse source 
Conflicts:
	pelican/settings.py
	tests/test_settings.py
This commit is contained in:
Justin Mayer 2012-03-22 08:29:27 -07:00
commit 6e467172e5
17 changed files with 135 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/settings.rst
View file

@ -86,7 +86,7 @@ Setting name (default value) What does it do?
.. [#] Default is the system locale.
URL Settings
URL settings
------------
You can customize the URLs and locations where files will be saved. The URLs and