4 commits

Author	SHA1	Message	Date
Jakub Jezek	d503395818	resolve: fix transition merge	2021-04-07 10:43:36 +02:00
Jakub Jezek	9228508dff	Resolve: merge openpype fixes	2021-04-06 15:11:00 +02:00
Jakub Jezek	f74bf468e0	Merge branch 'develop' into feature/916-resolve-instance-manager	2021-04-06 15:04:10 +02:00
Milan Kolar	8432e94615	rename folder	2021-04-01 18:54:46 +02:00