Merge remote-tracking branch 'checkcheckzz/master'

Conflicts:
	README.md

resolved
This commit is contained in:
Vinta 2014-07-01 23:04:24 +08:00
commit 7623c023ee

View File

@ -264,6 +264,7 @@ A curated list of awesome Python frameworks, libraries and resources. Inspired b
* [Quokka CMS](http://quokkaproject.org) - Flexible, extensible, small CMS powered by Flask and MongoDB.
* [Opps CMS](http://oppsproject.org/) - A Django-based CMS for magazines, newspapers websites and portals with high-traffic.
* [Plone](http://plone.org/) - Content Management System built on top of the open source application server Zope and the accompanying Content Management Framework.
* [django-cms](https://www.django-cms.org/en/) - An Open source enterprise content management system based on the django framework.
## RESTful API
@ -550,6 +551,8 @@ A curated list of awesome Python frameworks, libraries and resources. Inspired b
* [soundcloud-python](https://github.com/soundcloud/soundcloud-python) - A Python wrapper around the Soundcloud API.
* [google-api-python-client](https://github.com/google/google-api-python-client) - Google APIs Client Library for Python.
* [facebook-sdk](https://github.com/pythonforfacebook/facebook-sdk) - Facebook Platform Python SDK.
* [Wikipedia](https://wikipedia.readthedocs.org/en/latest/) - A Pythonic wrapper for the Wikipedia API.
* [python-instagram](https://github.com/Instagram/python-instagram) - A Python Client for Instagram API.
## Algorithms and Design Patterns