9 commits

Author	SHA1	Message	Date
iLLiCiTiT	bb97c3cdd2	Merge branch 'develop' into feature/maya_python_3 ... # Conflicts: # openpype/modules/default_modules/ftrack/python2_vendor/arrow # openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api	2021-09-15 14:45:35 +02:00
Ondrej Samohel	228829e81a	various fixes	2021-07-21 17:20:36 +02:00
Ondrej Samohel	e8066f072e	add scriptsmenu module and basic Settings	2021-06-24 13:03:43 +02:00
Derek Severin	183ead924d	Removal of unused 'capture_gui' module	2021-06-01 19:59:29 +07:00
Milan Kolar	a8ac7cd538	merge develop into main	2021-05-04 17:07:32 +02:00
iLLiCiTiT	66ec28ca96	fix context manager in maya capture	2021-04-20 13:55:00 +02:00
iLLiCiTiT	f6aa39af12	first version of iteritems replacement	2021-04-20 13:54:48 +02:00
iLLiCiTiT	66057a157d	added python 2 dns module to python 2 vendor	2021-04-15 14:29:19 +02:00
Milan Kolar	8432e94615	rename folder	2021-04-01 18:54:46 +02:00