Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 06:35:09 +0000 (16:35 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 06:35:09 +0000 (16:35 +1000)
1  2 
doc/python_api/sphinx_doc_gen.py

Simple merge