Skip to content

Commit b5d7daf

Browse files
author
kbehrman
committed
Merge branch 'json_api' of https://github.com/shotgunsoftware/python-api into json_api
2 parents 85c0928 + d53b39d commit b5d7daf

File tree

7 files changed

+1432
-325
lines changed

7 files changed

+1432
-325
lines changed

shotgun_api3/lib/httplib2/__init__.py

100755100644
Lines changed: 433 additions & 141 deletions
Large diffs are not rendered by default.

shotgun_api3/lib/httplib2/cacerts.txt

Lines changed: 633 additions & 0 deletions
Large diffs are not rendered by default.

shotgun_api3/lib/httplib2/iri2uri.py

100755100644
File mode changed.

0 commit comments

Comments
 (0)