7 Commits

Author	SHA1	Message	Date
Takeshi KOMIYA	98f7818101	Fix merging	2016-11-23 13:38:20 +09:00
Takeshi KOMIYA	0ee524e392	Merge branch 'stable' into 1.5-release	2016-11-23 13:22:38 +09:00
Takeshi KOMIYA	52f54a6379	Fix #3164: Change search order of `sphinx.ext.inheritance_diagram`	2016-11-23 00:50:02 +09:00
Takeshi KOMIYA	9676e79c1c	inheritance_diagram: Move _import_class_or_module() method to function	2016-11-23 00:49:46 +09:00
Takeshi KOMIYA	ceedbb4d51	Skip tests for inheritance_diagram if graphviz not found	2016-03-11 14:41:02 +09:00
Takeshi KOMIYA	d86ea47b52	Add `:caption:` option for sphinx.ext.inheritance_diagram	2016-03-11 13:20:05 +09:00
Takeshi KOMIYA	492980c23e	Add testcase for PR #2311	2016-02-14 15:06:28 +09:00