Merge branch 'v3.6.3'

Conflicts:
	docs/changelog.rst
	pelican/__init__.py
	setup.py
This commit is contained in:
Justin Mayer 2015-08-14 17:16:38 -07:00
commit f0a6725a74
4 changed files with 6 additions and 6 deletions

View file

@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
file_watcher, maybe_pluralize)
from pelican.writers import Writer
__version__ = "3.6.3.dev"
__version__ = "3.6.3"
DEFAULT_CONFIG_NAME = 'pelicanconf.py'