[Bf-extensions-cvs] [7a31152e] master: Merge branch 'blender-v2.82-release'

[Julien Duroure]

Commit: 7a31152eb0ebfb46280642ebac5957d6153ba5c9
Author: Julien Duroure
Date:   Sat Jan 11 21:30:20 2020 +0100
Branches: master
https://developer.blender.org/rBA7a31152eb0ebfb46280642ebac5957d6153ba5c9

Merge branch 'blender-v2.82-release'

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



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

diff --cc io_scene_gltf2/__init__.py
index b11f4c7c,bbb7f12d..fca62051
--- 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, 2, 0),
 -    "version": (1, 1, 38),
++    "version": (1, 2, 1),
      'blender': (2, 81, 6),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',