Milan Kolar c593d6798a Merge branch 'ftrack-all-iLLiCiT' ... # Conflicts: # pype/vendor/clique/collection.py # pype/vendor/ftrack_api/_version.py # pype/vendor/ftrack_api/session.py # pype/vendor/requests/__init__.py # pype/vendor/requests/adapters.py # pype/vendor/requests/api.py # pype/vendor/requests/auth.py # pype/vendor/requests/certs.py # pype/vendor/requests/compat.py # pype/vendor/requests/cookies.py # pype/vendor/requests/exceptions.py # pype/vendor/requests/models.py # pype/vendor/requests/sessions.py # pype/vendor/requests/status_codes.py # pype/vendor/requests/structures.py # pype/vendor/requests/utils.py # pype/vendor/six.py		2018-10-30 15:25:03 +01:00
..
__init__.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00
_version.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00
collection.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00
descriptor.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00
error.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00
sorted_set.py	ftrack-api-python3 dependencies to pype.vendor	2018-10-11 15:20:01 +02:00