Merge branch 'dev' of https://github.com/moremoban/setupmobans into dev

chfw · chfw · commit f97d6b951efb · 2019-05-05T17:31:48.000+01:00
diff --git a/templates/conf.py.jj2 b/templates/conf.py.jj2
@@ -8,6 +8,7 @@ DESCRIPTION = (
     ''
 )
 {% set project = name %}
+{% set master = 'index' %}
 {% set copyright = '{0} {1}'.format(copyright_year, company) %}
 {% if sphinx_extensions %}
 {%   set extensions = sphinx_extensions %}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ DESCRIPTION = (`
`8`	`8`	`''`
`9`	`9`	`)`
`10`	`10`	`{% set project = name %}`
	`11`	`+{% set master = 'index' %}`
`11`	`12`	`{% set copyright = '{0} {1}'.format(copyright_year, company) %}`
`12`	`13`	`{% if sphinx_extensions %}`
`13`	`14`	`{% set extensions = sphinx_extensions %}`