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

[Julien Duroure]

Commit: d852e3f949717fa0e9f9b82a5628abdf35960018
Author: Julien Duroure
Date:   Sat Apr 18 09:44:48 2020 +0200
Branches: master
https://developer.blender.org/rBAd852e3f949717fa0e9f9b82a5628abdf35960018

Merge branch 'blender-v2.83-release'

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



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

diff --cc io_scene_gltf2/__init__.py
index bd71d12d,261068bf..1a3bb3dd
--- 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, 5),
 -    "version": (1, 2, 69),
++    "version": (1, 3, 6),
      'blender': (2, 83, 9),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',