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 remote-tracking branch 'ametaireau/plugins' into plugins

Browse source 
Conflicts:
	docs/settings.rst
	pelican/__init__.py
	pelican/generators.py
	pelican/settings.py
	setup.py
This commit is contained in:
Bruno Binet 2012-03-20 01:07:25 +01:00
commit 4fe67b8947
14 changed files with 368 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/index.rst
View file

@ -60,6 +60,8 @@ A French version of the documentation is available at :doc:`fr/index`.
getting_started
settings
themes
pelican-themes
plugins
internals
pelican-themes
importer