Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 27 Dec 2018 22:33:42 +0000 (23:33 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 27 Dec 2018 22:33:42 +0000 (23:33 +0100)
Conflicts:
source/blender/windowmanager/intern/wm_operators.c

release/scripts/startup/bl_operators/wm.py

index 193d9e3..12b0e4d 100644 (file)
@@ -1026,7 +1026,7 @@ class WM_OT_doc_view(Operator):
     if bpy.app.version_cycle == "release":
         _prefix = ("https://docs.blender.org/api/current")
     else:
-        _prefix = ("https://docs.blender.org/api/master")
+        _prefix = ("https://docs.blender.org/api/blender2.7")
 
     def execute(self, context):
         url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)