[Bf-extensions-cvs] [68360056] master: Merge branch 'blender-v3.0-release'

[Julien Duroure]

Commit: 68360056f0fbd4093a497904b4c6755cc4ed02f3
Author: Julien Duroure
Date:   Sat Nov 6 10:01:45 2021 +0100
Branches: master
https://developer.blender.org/rBA68360056f0fbd4093a497904b4c6755cc4ed02f3

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc io_scene_gltf2/__init__.py
index 0ce7fb82,3c4022d5..8c738c41
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@@ -15,8 -15,8 +15,9 @@@
  bl_info = {
      'name': 'glTF 2.0 format',
      'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-     "version": (1, 8, 0),
-     'blender': (2, 91, 0),
 -    "version": (1, 7, 32),
++    "version": (1, 8, 1),
+     'blender': (3, 0, 0),
++>>>>>>> blender-v3.0-release
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',
      'warning': '',