Merge remote-tracking branch 'morgotth/master'

Conflicts:
	README.md

Fixed
This commit is contained in:
Vinta 2014-07-01 11:29:50 +08:00
commit eaeb9edfe7

View File

@ -147,6 +147,7 @@ A curated list of awesome Python frameworks, libraries and resources. Inspired b
* [Sphinx](http://sphinx-doc.org/) - Python Documentation generator.
* [reStructuredText](http://docutils.sourceforge.net/rst.html) - Markup Syntax and Parser Component of Docutils.
* [Python-Markdown](https://github.com/waylan/Python-Markdown) - A Python implementation of John Grubers Markdown.
* [MkDocs](http://www.mkdocs.org/) - Markdown friendly documentation generator.
## Imagery