Ian Cordasco ecfb85f85e Merge remote-tracking branch 'upstream/master' into proposed/3.0.0 ...

Conflicts:
      AUTHORS.rst
      requests/__init__.py
      requests/sessions.py
      tests/test_requests.py

2016-06-03 08:42:01 -05:00

..

_static

cheat code

2016-02-19 06:08:38 -05:00

_templates

add httpbin.org

2016-02-21 22:54:04 -05:00

_themes

Remove kenneth's sphinx themes from docs directory

2015-12-04 04:06:17 -08:00

community

Update readthedocs links.

2016-04-28 12:39:10 +02:00

dev

Remove stale sentence in philosophy.rst

2016-04-16 10:57:24 +01:00

user

Merge pull request #3173 from Lukasa/socks-proxy-docs

2016-05-05 12:18:27 -05:00

api.rst

Merge remote-tracking branch 'upstream/master' into proposed/3.0.0

2016-06-03 08:42:01 -05:00

conf.py

Update readthedocs links.

2016-04-28 12:39:10 +02:00

index.rst

improvements to index

2016-02-21 20:32:36 -05:00

make.bat

docs cleanup

2016-02-19 00:56:14 -05:00

Makefile

docs cleanup

2016-02-19 00:56:14 -05:00