File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change 3838 {% if release.is_dev %}
3939 {% if "internals" not in docurl %}{# The dev version is canonical for internals/. #}
4040 < div id ="dev-warning " class ="doc-floating-warning ">
41+ < < < < < < < HEAD
4142 {% blocktrans trimmed %}
4243 This document is for Django 's development version, which can be significantly different from previous releases.
43- < a href ="https://docs.djangoproject.com/en/stable/ " style ="font-weight : bold; text-decoration: underline; "> Click here for the stable version </ a >
44+ < a href="{% url 'docs_version' version='stable %} " style ="font-weight : bold; text-decoration: underline; "> Click here for the stable version </ a >
45+ =======
46+ {% blocktrans trimmed %}
47+ This document is for Django's development version, which can be significantly different from previous releases.
48+ < a href ="/en/stable/ " style ="font-weight : bold; text-decoration: underline; "> Click here for the stable version </ a >
49+ > > > > > > > ead4fc41 (use relative links to stable docs in warning alert (fixes env issue))
4450 {% endblocktrans %}
4551 </ div >
4652 {% endif %}
You can’t perform that action at this time.
0 commit comments