[Bf-extensions-cvs] [f94f46da] master: Merge branch 'blender-v2.83-release'

[Julien Duroure]

Commit: f94f46dac80c4ed603c2cd480f54f09c100c3a36
Author: Julien Duroure
Date:   Sat Apr 18 09:14:25 2020 +0200
Branches: master
https://developer.blender.org/rBAf94f46dac80c4ed603c2cd480f54f09c100c3a36

Merge branch 'blender-v2.83-release'

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



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

diff --cc io_scene_gltf2/__init__.py
index 504f5afe,4a7b9f3c..edff5a32
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@@ -15,7 -15,7 +15,7 @@@
  bl_info = {
      'name': 'glTF 2.0 format',
      'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-     "version": (1, 3, 1),
 -    "version": (1, 2, 65),
++    "version": (1, 3, 2),
      'blender': (2, 83, 9),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',
diff --cc object_collection_manager/__init__.py
index f386c36e,943e5b0f..b4807ad7
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@@ -23,6 -23,7 +23,10 @@@ bl_info = 
      "description": "Manage collections and their objects",
      "author": "Ryan Inch",
      "version": (2,7,11),
++<<<<<<< HEAD
++=======
+     "blender": (2, 80, 0),
++>>>>>>> blender-v2.83-release
      "location": "View3D - Object Mode (Shortcut - M)",
      "warning": '',  # used for warning icon and text in addons panel
      "doc_url": "{BLENDER_MANUAL_URL}/addons/interface/collection_manager.html",