Merge branch 'thubrecht/django3' into 'master'
Update to Django 3.2 See merge request klub-dev-ens/WikiENS!18
This commit is contained in:
commit
25a1b880e5
4 changed files with 5 additions and 5 deletions
|
@ -113,6 +113,7 @@ DATABASES = {
|
|||
}
|
||||
}
|
||||
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
Django==2.2.*
|
||||
Django==3.2.*
|
||||
git+https://git.eleves.ens.fr/klub-dev-ens/django-allauth-ens.git@1.1.3
|
||||
wiki==0.7
|
||||
wiki==0.7.*
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "wiki/base_site.html" %}
|
||||
{% load i18n staticfiles %}
|
||||
{% load sekizai_tags %}
|
||||
{% load i18n static sekizai_tags %}
|
||||
|
||||
{% block wiki_site_title %} - WikiENS{% endblock %}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "wiki/base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load static %}
|
||||
|
||||
{% block wiki_site_title %}Groupes - WikiENS{% endblock %}
|
||||
|
||||
|
|
Loading…
Reference in a new issue