Jeff Forcier ba017e9e6c Merge branch '1.12' into 1.13 ... Conflicts: paramiko/sftp_client.py sites/www/changelog.rst tests/test_sftp.py		2014-04-16 15:24:04 -04:00
..
_templates	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog.py	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog.rst	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
changelog.rst	Merge branch '1.12' into 1.13	2014-04-16 15:24:04 -04:00
conf.py	Re-enable Intersphinx from www -> docs	2014-03-03 18:22:33 -08:00
contact.rst	Remove blog link for now	2014-01-30 14:20:04 -08:00
contributing.rst	Fix broken link format	2014-01-30 14:20:13 -08:00
index.rst	Prevent warning about unlinked blog page	2014-01-28 16:00:03 -08:00
installing.rst	Uggh how did this slip in	2014-03-21 17:29:31 -07:00