Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into 3.0/refactoring

Browse source
This commit is contained in:
Ondrej Samohel 2020-10-06 10:33:45 +02:00
commit f9c9214e35
No known key found for this signature in database
GPG key ID: 8A29C663C672C2B7
9 changed files with 191 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pype/version.py
View file

@ -1,3 +1,7 @@
<<<<<<< HEAD
# -*- coding: utf-8 -*-
"""Package declaring Pype version."""
__version__ = "3.0.0"
=======
__version__ = "2.12.3"
>>>>>>> origin/develop