Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 10:15:18 +0000 (20:15 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 10:15:18 +0000 (20:15 +1000)
1  2 
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
release/scripts/modules/bpy/ops.py

Simple merge