Merge branch 'master' into jinja-custom

This commit is contained in:
Justin Mayer 2020-04-12 16:44:22 +02:00 committed by GitHub
commit d4167bf7f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
136 changed files with 294 additions and 269 deletions

View file

@ -724,7 +724,7 @@ Time and Date
.. _Jinja global namespace documentation: https://jinja.palletsprojects.com/en/master/api/#the-global-namespace
.. _Jinja custom tests documentation: https://jinja.palletsprojects.com/en/master/api/#custom-tests
.. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
.. _locales on Windows: https://www.microsoft.com/en-us/download/details.aspx?id=55979
.. _locale(1): https://linux.die.net/man/1/locale
@ -1372,5 +1372,5 @@ Example settings
:language: python
.. _Jinja Environment documentation: http://jinja.pocoo.org/docs/dev/api/#jinja2.Environment
.. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/master/api/#jinja2.Environment
.. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html