Merge branch 'patch-2' of github.com:kuyan/python-guide into patch-2

Browse Source

* 'patch-2' of github.com:kuyan/python-guide:
  Add link to 'Python in a Nutshell'.
  Update link to 'A Byte of Python'.
  Update virtualenvwrapper documentation links.
  Update link to Gondor documentation.
  Update Gunicorn help link.
  Add Qt link.
  Use Wayback Machine to resolve a dead link.
  Update Travis CI URL because always https.
  Update tox URL.
  Update Buildbot URL.

Conflicts:
	docs/intro/learning.rst

...

This commit is contained in:

kuyan

2013-09-16 18:36:37 -07:00

parent 2cd385e61c 4cc1d119f1

commit 78a1284a09

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available