Merge branch 'stable'

This commit is contained in:
shimizukawa
2015-11-22 00:25:26 +09:00
7 changed files with 35 additions and 4 deletions

View File

@@ -0,0 +1,2 @@
[theme]
inherit = basic

View File

@@ -0,0 +1,2 @@
[theme]
inherit = base_theme1

View File

@@ -0,0 +1,7 @@
# -*- coding: utf-8 -*-
import sys, os
templates_path = ['_templates']
master_doc = 'index'
html_theme = 'base_theme2'

View File

@@ -0,0 +1,3 @@
============================
Test double inheriting theme
============================