merge heads and resolve conflicts

This commit is contained in:
Takayuki Shimizukawa
2013-10-13 17:55:37 +09:00
2 changed files with 10 additions and 8 deletions

View File

@@ -18,6 +18,8 @@ Bugs fixed
* Restore ``versionmodified`` CSS class for versionadded/changed and deprecated
directives.
* Fix: `html_theme_path=['.']` is a trigger of rebuild all documents always
(This change keeps the current "theme changes cause a rebuild" feature).
Release 1.2 beta3 (released Oct 3, 2013)