Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 21:14:52 +0000 (08:14 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 21:14:52 +0000 (08:14 +1100)
1  2 
doc/python_api/sphinx_doc_gen.py

Simple merge