Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2018 07:31:52 +0000 (09:31 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2018 07:31:52 +0000 (09:31 +0200)
1  2 
release/scripts/modules/addon_utils.py
release/scripts/startup/bl_ui/space_text.py